rename to existingSecret* + CI file

Signed-off-by: ashotland <[email protected]>
dragonflydb · Feb 16, 2023 · ed28177 · ed28177
1 parent b53b3fd
commit ed28177
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/contrib/charts/dragonfly/ci/passwordsecret-values.yaml b/contrib/charts/dragonfly/ci/passwordsecret-values.yaml
@@ -0,0 +1,5 @@
+passwordFromSecret:
+  enable: true
+  existingSecret:
+    name: "aaa"
+    key: "ccc"
diff --git a/contrib/charts/dragonfly/templates/_pod.tpl b/contrib/charts/dragonfly/templates/_pod.tpl
@@ -72,8 +72,8 @@ containers:
       - name: DFLY_PASSWORD
         valueFrom:
           secretKeyRef:
-            name: {{ .Values.passwordFromSecret.secretName }}
-            key: {{ .Values.passwordFromSecret.secretKey }}
+            name: {{ .Values.passwordFromSecret.existingSecret.name }}
+            key: {{ .Values.passwordFromSecret.existingSecret.key }}
     {{- end }}
   {{- with .Values.extraContainers }}
   {{- if eq (typeOf .) "string" }}

diff --git a/contrib/charts/dragonfly/values.yaml b/contrib/charts/dragonfly/values.yaml
@@ -123,11 +123,13 @@ tls:
   #   HLunol88AeTOcKfD6hBYGvcRfu5NV29jJxZCOBfbFQXjnNlnrhRCag==
   #   -----END RSA PRIVATE KEY-----
 
-# If enabled will set DFLY_PASSOWRD environment variable with the specified secret value
+# If enabled will set DFLY_PASSOWRD environment variable with the specified existing secret value
+# Nothe that if enabled and the secret does not exist pods will not start
 passwordFromSecret:
   enable: false
-  secretName: ""
-  secretKey: ""
+  existingSecret:
+    name: ""
+    key: ""
 
 
 probes: