Merge pull request #142 from kloeckner-i/METAL-3549/fix_chart_volume_…

…mount METAL-3549 do not mount volume when secret is undefined
kloeckner-i · May 10, 2022 · 521ae10 · 521ae10
2 parents 8d51387 + 9db0007
commit 521ae10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/charts/db-operator/Chart.yaml b/charts/db-operator/Chart.yaml
@@ -4,4 +4,4 @@ kubeVersion: ">= 1.19-prerelease <= 1.23-prerelease"
 appVersion: "1.6.1"
 description: A Database Operator
 name: db-operator
-version: 1.2.1
+version: 1.2.2
diff --git a/charts/db-operator/templates/operator.yaml b/charts/db-operator/templates/operator.yaml
@@ -70,10 +70,12 @@ spec:
           - mountPath: /run/secrets/gcloudsqladmin
             name: serviceaccount-cloudsql-admin
             readOnly: true
+          {{- if .Values.secrets.gsql.readonly }}
           - mountPath: /run/secrets/gcloudsqlclient
             name: serviceaccount-cloudsql-client
             readOnly: true
           {{- end }}
+          {{- end }}
           - mountPath: /run/config/
             name: config-volume
             readOnly: true
@@ -98,10 +100,12 @@ spec:
           secret:
             defaultMode: 420
             secretName: cloudsql-admin-serviceaccount
+      {{- if .Values.secrets.gsql.readonly }}
         - name: serviceaccount-cloudsql-client
           secret:
             defaultMode: 420
             secretName: cloudsql-readonly-serviceaccount
+      {{- end }}
       {{- end }}
         - name: config-volume
           configMap: