fix(edge): existing secrets with envFrom should not be interpolated i…

…nto env setting fixes #9111
Unleash · Jan 24, 2025 · e5f7920 · e5f7920
1 parent e1ae6b0
commit e5f7920
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/charts/unleash-edge/Chart.yaml b/charts/unleash-edge/Chart.yaml
@@ -5,8 +5,7 @@ icon: https://docs.getunleash.io/img/logo.svg
 
 type: application
 
-version: 2.7.4
-
+version: 3.0.0
 appVersion: "v19.6.1"
 
 maintainers:

diff --git a/charts/unleash-edge/ci/unleash-edge-values.yaml b/charts/unleash-edge/ci/unleash-edge-values.yaml
@@ -6,6 +6,8 @@ autoscaling:
 ingress:
   enabled: true
 
+existingSecrets: ""
+
 edge:
   upstreamUrl: "http://unleash:4242"
 

diff --git a/charts/unleash-edge/templates/deployment.yaml b/charts/unleash-edge/templates/deployment.yaml
@@ -45,16 +45,18 @@ spec:
             - name: RUST_LOG
               value: "{{ .Values.edge.logLevel }}"
            {{- end }}
-           {{- if .Values.existingSecrets }}
-             {{- toYaml .Values.existingSecrets | nindent 12 }}
-           {{- end }}
            {{- if .Values.edge.logFormat }}
             - name: LOG_FORMAT
               value: "{{ .Values.edge.logFormat }}"
            {{- end }}
            {{- if .Values.env }}
             {{- toYaml .Values.env | nindent 12 }}
            {{- end }}
+          {{- if .Values.existingSecrets }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.existingSecrets }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

diff --git a/charts/unleash-edge/values.yaml b/charts/unleash-edge/values.yaml
@@ -169,11 +169,7 @@ extraObjects: []
 # adds environmentvars for existing secrets to the container via tpl function
 existingSecrets:
   ""
-  # - name: TOKENS
-  #   valueFrom:
-  #     secretKeyRef:
-  #       name: secretname
-  #       key: secretkey
+  # Name of the secret containing key value pairs
 
 edge:
   upstreamUrl: "http://unleash.unleash:4242"