fix(secrets): apply prior secrets fix to syncserverdb

Author: holysoles

charts/fx-syncstorage/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.8
+version: 0.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/fx-syncstorage/README.md

@@ -1,6 +1,6 @@
 # fx-syncstorage
 
-![Version: 0.1.8](https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: syncstorage-rs-mysql-0.18.2](https://img.shields.io/badge/AppVersion-syncstorage--rs--mysql--0.18.2-informational?style=flat-square)
+![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: syncstorage-rs-mysql-0.18.2](https://img.shields.io/badge/AppVersion-syncstorage--rs--mysql--0.18.2-informational?style=flat-square)
 
 Helm chart for Mozilla's Rust based Sync server for Firefox data synchronization.
 

charts/fx-syncstorage/templates/secret_syncserverdb.yaml

@@ -1,4 +1,5 @@
 {{- if (include "fx-syncstorage.autogenerateSyncDb" .) }}
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace .Values.syncserverdb.auth.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -10,6 +11,14 @@ metadata:
     helm.sh/resource-policy: keep
   {{- end }}
 data:
-  mysql-root-password: {{ randAlphaNum 20 | b64enc | quote }}
-  mysql-password: {{ randAlphaNum 20 | b64enc | quote }}
-{{- end }}
+  mysql-root-password: {{- if $secret }}
+    {{ index $secret.data "mysql-root-password" }}
+  {{- else }}
+    {{ randAlphaNum 20 | b64enc | quote }}
+  {{- end }}
+  mysql-password: {{- if $secret }}
+    {{ index $secret.data "mysql-password" }}
+  {{- else }}
+    {{ randAlphaNum 20 | b64enc | quote }}
+  {{- end }}
+{{- end }}