Merge pull request #20 from ml-/allow-unsafe-config

Move allowUnsafeConfigurations to .spec, add value
percona · Jun 25, 2020 · 552956e · 552956e
2 parents 5dbe045 + f35c09e
commit 552956e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/charts/pxc-db/Chart.yaml b/charts/pxc-db/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.4.0"
 description: A Helm chart for installing Percona XtraDB Cluster Databases using the PXC Operator.
 name: pxc-db
 home: https://www.percona.com/doc/kubernetes-operator-for-pxc/kubernetes.html
-version: 0.1.8
+version: 0.1.9
 maintainers:
   - name: paulczar
     email: [email protected]
diff --git a/charts/pxc-db/production-values.yaml b/charts/pxc-db/production-values.yaml
@@ -14,6 +14,7 @@ nameOverride: "production"
 fullnameOverride: "production"
 
 pause: false
+allowUnsafeConfigurations: false
 
 pxc:
   size: 3

diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml
@@ -27,13 +27,13 @@ spec:
   sslInternalSecretName: {{ include "pxc-database.fullname" . }}-ssl-internal
   {{- end }}
   {{- end }}
+  {{- if or .Values.allowUnsafeConfigurations .Values.pxc.disableTLS }}
+  allowUnsafeConfigurations: true
+  {{- end }}
   pause: {{ .Values.pause }}
   {{- $pxc := .Values.pxc }}
   pxc:
     size: {{ $pxc.size }}
-    {{- if .Values.pxc.disableTLS }}
-    allowUnsafeConfigurations: false
-    {{- end }}
     image: "{{ $pxc.image.repository }}:{{ $pxc.image.tag }}"
     readinessDelaySec: {{ $pxc.readinessDelaySec }}
     livenessDelaySec: {{ $pxc.livenessDelaySec }}

diff --git a/charts/pxc-db/values.yaml b/charts/pxc-db/values.yaml
@@ -13,6 +13,7 @@ nameOverride: ""
 fullnameOverride: ""
 
 pause: false
+allowUnsafeConfigurations: false
 
 pxc:
   size: 3