v3.0.646

env0 · Jan 16, 2024 · 199687a · 199687a
1 parent 8728991
commit 199687a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/templates/scaled-job.yml b/templates/scaled-job.yml
@@ -29,6 +29,11 @@ spec:
           annotations:
             "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
             "karpenter.sh/do-not-evict": "true"
+            {{- if .Values.podAdditionalAnnotations }}
+            {{- range $k, $v := .Values.podAdditionalAnnotations }}
+            "{{ $k }}": "{{ $v }}"
+            {{- end }}
+            {{ end }}            
         spec:
           volumes:
             {{ if not (hasKey .Values "env0StateEncryptionKey") }}
@@ -203,6 +208,14 @@ spec:
                 - name: CONSOLE_LOGS_LEVEL
                   value: {{ .Values.logger.level }}
                 {{ end }}
+                {{ if .Values.podAdditionalEnvVars }}
+                {{- range $key, $value := .Values.podAdditionalEnvVars }}
+                - name: {{ $key }}
+                  value: {{ $value | quote }}
+                {{- end }}
+                - name: ADDITIONAL_ENV_VARS
+                  value: '[{{- $keys := ""}}{{- range $key, $value := .Values.podAdditionalEnvVars }}{{- if $keys }}{{- $keys = printf "\"%s\",\"%s\"" $keys $key }}{{- else }}{{- $keys = $key }}{{- end }}{{- end }}{{- $keys }}]'
+                {{ end }}
 
 
           terminationGracePeriodSeconds: 18000

diff --git a/values.schema.json b/values.schema.json
@@ -315,6 +315,20 @@
         }
       },
       "type": "object"
+    },
+    "podAdditionalEnvVars": {
+      "description": "Additional Environment variables to be passed to the agent pods, which will also be passed to the deployment process",
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "podAdditionalAnnotations": {
+      "description": "Additional annotations to be set on deployment pods",
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
     }
   },
   "required": [