[stable/elasticsearch-curator] load envs from secrets first (#20874)

* [stable/elasticsearch-curator] load envs from secrets first

allows using environment variable composition with env
variables that are loaded from secrets (e.g. for loading
a HTTP password and then compositing it into a full
basic auth env variable).

Signed-off-by: Marvin Beckers <marvin.beckers@cerence.com>

* stable/elasticsearch-curator: bump version

Signed-off-by: Marvin Beckers <marvin.beckers@cerence.com>

stable/elasticsearch-curator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "5.7.6"
 description: A Helm chart for Elasticsearch Curator
 name: elasticsearch-curator
-version: 2.1.4
+version: 2.1.5
 home: https://github.com/elastic/curator
 keywords:
 - curator

stable/elasticsearch-curator/templates/cronjob.yaml

@@ -89,12 +89,6 @@ spec:
               args: [ "--config", "/etc/es-curator/config.yml", "/etc/es-curator/action_file.yml" ]
 {{- end }}
               env:
-{{- if .Values.env }}
-{{- range $key,$value := .Values.env }}
-              - name: {{ $key | upper | quote}}
-                value: {{ $value | quote}}
-{{- end }}
-{{- end }}
 {{- if .Values.envFromSecrets }}
 {{- range $key,$value := .Values.envFromSecrets }}
               - name: {{ $key | upper | quote}}
@@ -103,6 +97,12 @@ spec:
                     name: {{ $value.from.secret | quote}}
                     key: {{ $value.from.key | quote}}
 {{- end }}
+{{- end }}
+{{- if .Values.env }}
+{{- range $key,$value := .Values.env }}
+              - name: {{ $key | upper | quote}}
+                value: {{ $value | quote}}
+{{- end }}
 {{- end }}
               resources:
 {{ toYaml .Values.resources | indent 16 }}