chore(cert_manager): change cert_manager_enabled to global

duanhongyi · duanhongyi · commit 4797fa169547 · 2020-08-12T10:28:16.000+08:00
diff --git a/charts/monitor/charts/grafana/templates/monitor-grafana-certificate.yaml b/charts/monitor/charts/grafana/templates/monitor-grafana-certificate.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.cert_manager_enabled }}
+{{ if .Values.global.cert_manager_enabled }}
 apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
diff --git a/charts/monitor/charts/grafana/templates/monitor-grafana-ingress.yaml b/charts/monitor/charts/grafana/templates/monitor-grafana-ingress.yaml
@@ -26,7 +26,7 @@ spec:
         backend:
           serviceName: drycc-monitor-grafana
           servicePort: 80
-  {{ if .Values.cert_manager_enabled }}
+  {{ if .Values.global.cert_manager_enabled }}
   tls:
     - secretName: drycc-monitor-grafana-auto-tls
       hosts:
diff --git a/charts/monitor/charts/influxdb/templates/monitor-influxdb-api-certificate.yaml b/charts/monitor/charts/influxdb/templates/monitor-influxdb-api-certificate.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.cert_manager_enabled }}
+{{ if .Values.global.cert_manager_enabled }}
 apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
diff --git a/charts/monitor/charts/influxdb/templates/monitor-influxdb-api-ingress.yaml b/charts/monitor/charts/influxdb/templates/monitor-influxdb-api-ingress.yaml
@@ -26,7 +26,7 @@ spec:
         backend:
           serviceName: drycc-monitor-influxapi
           servicePort: 80
-  {{ if .Values.cert_manager_enabled }}
+  {{ if .Values.global.cert_manager_enabled }}
   tls:
     - secretName: drycc-monitor-influxapi-auto-tls
       hosts:
diff --git a/charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-certificate.yaml b/charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-certificate.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.cert_manager_enabled }}
+{{ if .Values.global.cert_manager_enabled }}
 apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
diff --git a/charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-ingress.yaml b/charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-ingress.yaml
@@ -26,7 +26,7 @@ spec:
         backend:
           serviceName: drycc-monitor-influxui
           servicePort: 80
-  {{ if .Values.cert_manager_enabled }}
+  {{ if .Values.global.cert_manager_enabled }}
   tls:
     - secretName: drycc-monitor-influxui-auto-tls
       hosts:
diff --git a/charts/monitor/values.yaml b/charts/monitor/values.yaml
@@ -54,3 +54,5 @@ global:
   logger_redis_location: "on-cluster"
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false
+  # Whether cert_manager is enabled to automatically generate drycc certificates
+  cert_manager_enabled: "true"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{ if .Values.cert_manager_enabled }}`
	`1`	`+{{ if .Values.global.cert_manager_enabled }}`
`2`	`2`	`apiVersion: cert-manager.io/v1alpha2`
`3`	`3`	`kind: Certificate`
`4`	`4`	`metadata:`