Skip to content

Commit 8d61eb2

Browse files
authored
fix: ray部署修改 (#221)
1 parent 91f0230 commit 8d61eb2

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

deployment/helm/datamate/charts/ray-cluster/templates/raycluster-cluster.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,18 @@ spec:
9696
securityContext:
9797
{{- toYaml . | nindent 12 }}
9898
{{- end }}
99-
{{- $defult := include "ray-cluster.image" . -}}
99+
{{- $default := include "ray-cluster.image" . -}}
100100
{{- with .Values.head.sidecarContainers }}
101101
{{- range $index, $container := . }}
102-
{{- $image := default $defult $container.image -}}
103-
{{- with $.Values.global.image.repository -}}
104-
{{- $image = printf "%s/%s" (trimSuffix "/" .) (default $defult $container.image) -}}
102+
{{- $image := "" -}}
103+
{{- if $container.image -}}
104+
{{- if $.Values.global.image.repository -}}
105+
{{- $image = printf "%s/%s" (trimSuffix "/" $.Values.global.image.repository) $container.image -}}
106+
{{- else -}}
107+
{{- $image = $container.image -}}
108+
{{- end -}}
109+
{{- else -}}
110+
{{- $image = $default -}}
105111
{{- end -}}
106112
{{- $mergedObj := mergeOverwrite $container (dict "image" $image) }}
107113
- {{- toYaml $mergedObj | nindent 10 }}

0 commit comments

Comments
 (0)