From 8d61eb28c35ecd9cbeea8d5f26aef6372f5ae130 Mon Sep 17 00:00:00 2001 From: hhhhsc701 <56435672+hhhhsc701@users.noreply.github.com> Date: Sun, 4 Jan 2026 09:42:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ray=E9=83=A8=E7=BD=B2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20(#221)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ray-cluster/templates/raycluster-cluster.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/deployment/helm/datamate/charts/ray-cluster/templates/raycluster-cluster.yaml b/deployment/helm/datamate/charts/ray-cluster/templates/raycluster-cluster.yaml index cf7af6c..2cb2ce8 100644 --- a/deployment/helm/datamate/charts/ray-cluster/templates/raycluster-cluster.yaml +++ b/deployment/helm/datamate/charts/ray-cluster/templates/raycluster-cluster.yaml @@ -96,12 +96,18 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} - {{- $defult := include "ray-cluster.image" . -}} + {{- $default := include "ray-cluster.image" . -}} {{- with .Values.head.sidecarContainers }} {{- range $index, $container := . }} - {{- $image := default $defult $container.image -}} - {{- with $.Values.global.image.repository -}} - {{- $image = printf "%s/%s" (trimSuffix "/" .) (default $defult $container.image) -}} + {{- $image := "" -}} + {{- if $container.image -}} + {{- if $.Values.global.image.repository -}} + {{- $image = printf "%s/%s" (trimSuffix "/" $.Values.global.image.repository) $container.image -}} + {{- else -}} + {{- $image = $container.image -}} + {{- end -}} + {{- else -}} + {{- $image = $default -}} {{- end -}} {{- $mergedObj := mergeOverwrite $container (dict "image" $image) }} - {{- toYaml $mergedObj | nindent 10 }}