fix secrets templates to use 'secret.data' for environment variables

RubxKube · Dec 13, 2024 · c01e48b · c01e48b
1 parent eb8eb1b
commit c01e48b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/charts/common/templates/deployment.yaml b/charts/common/templates/deployment.yaml
@@ -44,7 +44,7 @@ spec:
               {{- if .Values.deployment.cpuLimit }}
               cpu: "{{ .Values.deployment.cpuLimit }}"
               {{- end }}
-          {{- if or (.Values.variables.nonSecret) (.Values.variables.secret) (.Values.secret.existingSecret) }}
+          {{- if or (.Values.variables.nonSecret) (.Values.variables.secret.data) (.Values.variables.secret.existingSecret) }}
           env:
             {{- if .Values.variables.nonSecret }}
               {{- range $index, $value := .Values.variables.nonSecret }}
@@ -53,7 +53,7 @@ spec:
               {{- end }}
             {{- end }}
             {{- if .Values.variables.secret }}
-              {{- range $index, $value := .Values.variables.secret }}
+              {{- range $index, $value := .Values.variables.secret.data }}
           - name: {{ $index }}
             valueFrom:
               secretKeyRef:
@@ -62,6 +62,7 @@ spec:
               {{- end }}
             {{- end }}
             {{- if .Values.variables.secret.existingSecret }}
+            toto
               {{- range $index, $value := .Values.variables.secret.existingSecret }}
           - name: {{ $value.envName }}
             valueFrom:

diff --git a/charts/common/templates/secrets.yaml b/charts/common/templates/secrets.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.variables.secret }}
+{{ if .Values.variables.secret.data }}
 {{- $dot := . }}
 {{- range $index, $value := .Values.variables.secret.data }}
 apiVersion: v1

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -1,4 +1,3 @@
----
 
 define: &containerPort 80
 
@@ -47,8 +46,8 @@ variables:
     data: {}
     # user: "username"
     # password: "hugepassword"
-    existingSecret: {}
-      # - name: "existing-secret"
+    existingSecret: []
+      # - name: "existing-secret-name"
       #   key: "key"
       #   envName: "ENV_NAME"
       # - name: another-existing-secret