Add common containerEnv section to Helm Chart (#1932)

ray-project · Feb 21, 2024 · e330c03 · e330c03
1 parent 0074129
commit e330c03
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/helm-chart/ray-cluster/templates/raycluster-cluster.yaml b/helm-chart/ray-cluster/templates/raycluster-cluster.yaml
@@ -61,7 +61,12 @@ spec:
             securityContext:
             {{- toYaml .Values.head.securityContext | nindent 14 }}
             env:
-            {{- toYaml .Values.head.containerEnv | nindent 14}}
+            {{- with .Values.common.containerEnv }}
+            {{- toYaml . | nindent 14 }}
+            {{- end }}
+            {{- with .Values.head.containerEnv }}
+            {{- toYaml . | nindent 14 }}
+            {{- end }}
             {{- with .Values.head.envFrom }}
             envFrom: {{- toYaml . | nindent 14}}
             {{- end }}
@@ -142,7 +147,12 @@ spec:
             securityContext:
             {{- toYaml $values.securityContext | nindent 14 }}
             env:
-            {{- toYaml $values.containerEnv | nindent 14}}
+            {{- with $.Values.common.containerEnv }}
+            {{- toYaml . | nindent 14 }}
+            {{- end }}
+            {{- with $values.containerEnv }}
+            {{- toYaml . | nindent 14}}
+            {{- end }}
             {{- if $values.envFrom }}
             envFrom: {{- toYaml $values.envFrom | nindent 14 }}
             {{- end }}
@@ -221,7 +231,12 @@ spec:
             securityContext:
             {{- toYaml .Values.worker.securityContext | nindent 14 }}
             env:
-            {{- toYaml .Values.worker.containerEnv | nindent 14}}
+            {{- with .Values.common.containerEnv }}
+            {{- toYaml . | nindent 14 }}
+            {{- end }}
+            {{- with .Values.worker.containerEnv }}
+            {{- toYaml . | nindent 14}}
+            {{- end }}
             {{- with .Values.worker.envFrom }}
             envFrom: {{- toYaml . | nindent 14}}
             {{- end }}

diff --git a/helm-chart/ray-cluster/values.yaml b/helm-chart/ray-cluster/values.yaml
@@ -16,6 +16,13 @@ fullnameOverride: ""
 imagePullSecrets: []
   # - name: an-existing-secret
 
+# common defined values shared between the head and worker
+common:
+  # containerEnv specifies environment variables for the Ray head and worker containers.
+  # Follows standard K8s container env schema.
+  containerEnv: {}
+  #  - name: BLAH
+  #    value: VAL
 head:
   # rayVersion determines the autoscaler's image version.
   # It should match the Ray version in the image of the containers.