Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move deployment in cert-manager namespace #2

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion class/defaults.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
cert_exoscale:
=_metadata: {}
namespace: syn-cert-exoscale
namespace: syn-cert-manager

manifestVersion: v0.3.0
kustomizeInput:
Expand Down
13 changes: 0 additions & 13 deletions component/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@ local inv = kap.inventory();

// The hiera parameters for the component
local params = inv.parameters.cert_exoscale;
local isOpenshift = std.member([ 'openshift', 'oke' ], inv.parameters.facts.distribution);

local namespace = kube.Namespace(params.namespace) {
metadata+: {
labels+: {
'app.kubernetes.io/name': params.namespace,
// Configure the namespaces so that the OCP4 cluster-monitoring
// Prometheus can find the servicemonitors and rules.
[if isOpenshift then 'openshift.io/cluster-monitoring']: 'true',
},
},
};

local secret = kube.Secret('exoscale-secret') {
metadata+: {
Expand All @@ -30,6 +18,5 @@ local secret = kube.Secret('exoscale-secret') {

// Define outputs below
{
'00_namespace': namespace,
'20_secret': secret,
}
8 changes: 0 additions & 8 deletions docs/modules/ROOT/pages/references/parameters.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

The parent key for all of the following parameters is `cert_exoscale`.

== `namespace`

[horizontal]
type:: string
default:: `syn-cert-exoscale`

The namespace in which to deploy this component.


== `kustomizeInput`

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
annotations:
cert-manager.io/inject-ca-from: syn-cert-exoscale/cert-manager-webhook-exoscale-webhook-tls
cert-manager.io/inject-ca-from: syn-cert-manager/cert-manager-webhook-exoscale-webhook-tls
labels:
app: exoscale-webhook
chart: exoscale-webhook-0.3.0
Expand All @@ -14,6 +14,6 @@ spec:
groupPriorityMinimum: 1000
service:
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
version: v1alpha1
versionPriority: 15
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
spec:
replicas: 1
selector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale-ca
namespace: syn-cert-exoscale
namespace: syn-cert-manager
spec:
commonName: ca.exoscale-webhook.syn-cert-exoscale
commonName: ca.exoscale-webhook.syn-cert-manager
duration: 43800h0m0s
isCA: true
issuerRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale-webhook-tls
namespace: syn-cert-exoscale
namespace: syn-cert-manager
spec:
dnsNames:
- cert-manager-webhook-exoscale
- cert-manager-webhook-exoscale.syn-cert-exoscale
- cert-manager-webhook-exoscale.syn-cert-exoscale.svc
- cert-manager-webhook-exoscale.syn-cert-manager
- cert-manager-webhook-exoscale.syn-cert-manager.svc
duration: 8760h0m0s
issuerRef:
name: cert-manager-webhook-exoscale-ca
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale-ca
namespace: syn-cert-exoscale
namespace: syn-cert-manager
spec:
ca:
secretName: cert-manager-webhook-exoscale-ca
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale-selfsign
namespace: syn-cert-exoscale
namespace: syn-cert-manager
spec:
selfSigned: {}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ subjects:
- apiGroup: ""
kind: ServiceAccount
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale:secrets-reader
namespace: syn-cert-exoscale
namespace: syn-cert-manager
rules:
- apiGroups:
- ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale:secrets-reader
namespace: syn-cert-exoscale
namespace: syn-cert-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand All @@ -16,4 +16,4 @@ subjects:
- apiGroup: ""
kind: ServiceAccount
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale:webhook-authentication-reader
namespace: syn-cert-exoscale
namespace: syn-cert-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand All @@ -16,4 +16,4 @@ subjects:
- apiGroup: ""
kind: ServiceAccount
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
spec:
ports:
- name: https
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ metadata:
heritage: Helm
release: exoscale-webhook
name: cert-manager-webhook-exoscale
namespace: syn-cert-exoscale
namespace: syn-cert-manager
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
name: exoscale-secret
name: exoscale-secret
namespace: syn-cert-exoscale
namespace: syn-cert-manager
stringData:
EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/exoscale/cert_webhook/s3_access_key
EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/exoscale/cert_webhook/s3_secret_key
Expand Down
Loading