Skip to content

Commit 38421b4

Browse files
committed
chore(cert_manager): change cert_manager_enabled to global
1 parent e80461b commit 38421b4

3 files changed

Lines changed: 6 additions & 12 deletions

File tree

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ if .Values.cert_manager_enabled }}
1+
{{ if .Values.global.cert_manager_enabled }}
22
apiVersion: cert-manager.io/v1alpha2
33
kind: Certificate
44
metadata:
@@ -11,12 +11,6 @@ spec:
1111
kind: ClusterIssuer
1212
dnsNames:
1313
- drycc.{{ .Values.platform_domain }}
14-
# privateKey:
15-
# rotationPolicy: Always
16-
# acme:
17-
# config:
18-
# - http01:
19-
# ingressClass: "{{ .Values.global.ingress_class }}"
20-
# domains:
21-
# - drycc.{{ .Values.platform_domain }}
14+
privateKey:
15+
rotationPolicy: Always
2216
{{- end }}

charts/controller/templates/controller-ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
backend:
2727
serviceName: drycc-controller
2828
servicePort: 80
29-
{{ if .Values.cert_manager_enabled }}
29+
{{ if .Values.global.cert_manager_enabled }}
3030
tls:
3131
- secretName: drycc-controller-auto-tls
3232
hosts:

charts/controller/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ k8s_api_verify_tls: "true"
1919
#
2020
# This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
2121
platform_domain: ""
22-
# Whether cert_manager is enabled to automatically generate controller certificates
23-
cert_manager_enabled: "true"
2422

2523
global:
2624
# Admin email, used for each component to send email to administrator
@@ -56,3 +54,5 @@ global:
5654
use_rbac: false
5755
# Please check `kubernetes.io/ingress.class`
5856
ingress_class: ""
57+
# Whether cert_manager is enabled to automatically generate controller certificates
58+
cert_manager_enabled: "true"

0 commit comments

Comments
 (0)