Allow setting orchestrator.secretName when deploying from helm

Author: calind

CHANGELOG.md

@@ -9,6 +9,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Changed
 ### Removed
 ### Fixed
+ * `orchestrator.secretName` is ignored in helm charts
 
 ## [0.6.1] - 2021-12-22
 ### Changed

deploy/charts/mysql-operator/templates/_orchestrator-helpers.tpl

@@ -20,11 +20,11 @@
 {{- end }}
 
 {{- define "orchestrator.secretName" -}}
-{{- if .Values.orchestrator.secretName }}
-  {{ .Values.orchestrator.secretName }}
-{{- else }}
-  {{ include "orchestrator.fullname" . }}
-{{- end }}
+{{- if .Values.orchestrator.secretName -}}
+{{ .Values.orchestrator.secretName }}
+{{- else -}}
+{{ include "orchestrator.fullname" . }}
+{{- end -}}
 {{- end }}
 
 {{- define "orchestrator.apiURL" -}}

deploy/charts/mysql-operator/templates/statefulset.yaml

@@ -44,12 +44,12 @@ spec:
             - name: ORC_TOPOLOGY_USER
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "orchestrator.fullname" . }}
+                  name: {{ include "orchestrator.secretName" . }}
                   key: TOPOLOGY_USER
             - name: ORC_TOPOLOGY_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "orchestrator.fullname" . }}
+                  name: {{ include "orchestrator.secretName" . }}
                   key: TOPOLOGY_PASSWORD
           {{- if .Values.extraEnv }}
             {{- toYaml .Values.extraEnv | nindent 12 }}
@@ -107,7 +107,7 @@ spec:
           envFrom:
             - prefix: ORC_
               secretRef:
-                name: {{ template "orchestrator.fullname" . }}
+                name: {{ include "orchestrator.secretName" . }}
           volumeMounts:
             - name: data
               mountPath: /var/lib/orchestrator