fix: env order

36node · Sep 5, 2024 · 064203b · 064203b
1 parent 02a1e7f
commit 064203b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/helm-chart/templates/backup.yaml b/helm-chart/templates/backup.yaml
@@ -47,11 +47,11 @@ spec:
                   value: {{ index .Values.storage.s3 "bucket" | quote }}
                 - name: "S3_PREFIX"
                   value: {{ index .Values.storage.s3 "prefix" | quote }}
-
                 {{- end }}
-                {{- range $key, $value := .Values.backup.env }}
+                {{- $env := .Values.backup.env }}
+                {{- range $key := $env | keys | sortAlpha }}
                 - name: "{{ $key }}"
-                  value: "{{ $value }}"
+                  value: "{{ index $env $key }}"
                 {{- end }}
               {{- if not (eq .Values.storage.type "s3") }}
               volumeMounts:

diff --git a/helm-chart/templates/restore.yaml b/helm-chart/templates/restore.yaml
@@ -48,9 +48,10 @@ spec:
             - name: "S3_PREFIX"
               value: {{ index .Values.storage.s3 "prefix" | quote }}
             {{- end }}
-            {{- range $key, $value := .Values.restore.env }}
+            {{- $env := .Values.backup.env }}
+            {{- range $key := $env | keys | sortAlpha }}
             - name: "{{ $key }}"
-              value: "{{ $value }}"
+              value: "{{ index $env $key }}"
             {{- end }}
           {{- if not (eq .Values.storage.type "s3") }}
           volumeMounts: