update

ucraft-com · Oct 11, 2023 · 8b8b25e · 8b8b25e
1 parent 615c635
commit 8b8b25e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/charts/backend/Chart.yaml b/charts/backend/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: backend
 description: Helm chart scaffolding for Backend applications.
 type: application
-version: 3.6.7
+version: 3.6.8
 appVersion: 1.3.0
diff --git a/charts/backend/templates/cronjob.yaml b/charts/backend/templates/cronjob.yaml
@@ -70,12 +70,9 @@ spec:
             {{- end }}
             {{- end }}
 
-            {{- if .Values.cronjob.config.env  }}
+            {{- with .Values.cronjob.extraEnv }}
             env:
-            {{- range $k, $v := .Values.cronjob.config.env }}
-            - name: "{{ $k }}"
-              value: "{{ $v }}"
-            {{- end }}
+              {{- toYaml . | nindent 12 }}
             {{- end }}
 
             {{- if .Values.cronjob.config.secrets  }}

diff --git a/charts/backend/values.yaml b/charts/backend/values.yaml
@@ -307,7 +307,7 @@ cronjob:
     isRepositoryPublic: true
     # -- The image pullPolicy to use
     pullPolicy: "IfNotPresent"
-
+  extraEnv: []
   config:
     command: []
     #  - "/bin/sh"
@@ -316,8 +316,6 @@ cronjob:
     #  - "echo 'Environment $(hello_env)! Secret $(username).'"
 
     # -- Map of environment variables to use within the job
-    env: {}
-    #  hello_env: "world"
 
     # -- Map of secrets that will be exposed as environment variables within the job
     secrets: {}

diff --git a/charts/frontend/Chart.yaml b/charts/frontend/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: frontend
 description: A frontend Helm chart for Kubernetes
 type: application
-version: 3.6.7
+version: 3.6.8
 appVersion: "0.3.10"
diff --git a/charts/frontend/templates/cronjob.yaml b/charts/frontend/templates/cronjob.yaml
@@ -70,12 +70,9 @@ spec:
             {{- end }}
             {{- end }}
 
-            {{- if .Values.cronjob.config.env  }}
+            {{- with .Values.cronjob.extraEnv }}
             env:
-            {{- range $k, $v := .Values.cronjob.config.env }}
-            - name: "{{ $k }}"
-              value: "{{ $v }}"
-            {{- end }}
+              {{- toYaml . | nindent 12 }}
             {{- end }}
 
             {{- if .Values.cronjob.config.secrets  }}

diff --git a/charts/frontend/values.yaml b/charts/frontend/values.yaml
@@ -233,7 +233,7 @@ cronjob:
     isRepositoryPublic: true
     # -- The image pullPolicy to use
     pullPolicy: "IfNotPresent"
-
+  extraEnv: []
   config:
     command: []
     #  - "/bin/sh"
@@ -242,8 +242,6 @@ cronjob:
     #  - "echo 'Environment $(hello_env)! Secret $(username).'"
 
     # -- Map of environment variables to use within the job
-    env: {}
-    #  hello_env: "world"
 
     # -- Map of secrets that will be exposed as environment variables within the job
     secrets: {}