Develop hsc (#58)

feature: 优化镜像构建/部署

deployment/helm/datamate/charts/ray-cluster/templates/_helpers.tpl

@@ -52,4 +52,29 @@ Create the name of the service account to use
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Name of image
+*/}}
+{{- define "ray-cluster.image" -}}
+{{- $name := default .Values.image.repository .Values.global.image.runtime.name }}
+{{- $tag := default .Values.image.tag .Values.global.image.runtime.tag }}
+{{- if .Values.global.image.repository }}
+{{- .Values.global.image.repository | trimSuffix "/" }}/{{ $name }}:{{ $tag }}
+{{- else }}
+{{- $name }}:{{ $tag }}
+{{- end }}
+{{- end }}
+
+{{/*
+Name of sidecar image
+*/}}
+{{- define "ray-cluster-sidecar.image" -}}
+{{- $name := default (printf "%s:%s" .Values.image.repository .Values.image.tag) .Values.head.sidecarContainers.image }}
+{{- if .Values.global.image.repository }}
+{{- .Values.global.image.repository | trimSuffix "/" }}/{{ $name }}
+{{- else }}
+{{- $name }}
+{{- end }}
+{{- end }}

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

@@ -58,13 +58,8 @@ spec:
         {{- end }}
         containers:
         - name: ray-head
-          {{- if .Values.head.image }}
-          image: {{ .Values.head.image.repository }}:{{ .Values.head.image.tag }}
-          imagePullPolicy: {{ .Values.head.image.pullPolicy }}
-          {{- else }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- end }}
+          image: {{ include "ray-cluster.image" . }}
+          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.global.image.pullPolicy }}
           {{- with .Values.head.command }}
           command:
           {{- toYaml . | nindent 10 }}
@@ -101,8 +96,16 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+        {{- $defult := printf "%s:%s" .Values.image.repository .Values.image.tag }}
         {{- with .Values.head.sidecarContainers }}
-        {{- toYaml . | nindent 8 }}
+        {{- range $index, $container := . }}
+        {{- $image := default $defult $container.image -}}
+        {{- with $.Values.global.image.repository -}}
+        {{- $image = printf "%s/%s" (trimSuffix "/" .) (default $defult $container.image) -}}
+        {{- end -}}
+        {{- $mergedObj := mergeOverwrite $container (dict "image" $image) }}
+        - {{- toYaml $mergedObj | nindent 10 }}
+        {{- end }}
         {{- end }}
         {{- with .Values.imagePullSecrets }}
         imagePullSecrets:
@@ -185,13 +188,8 @@ spec:
         {{- end }}
         containers:
         - name: ray-worker
-          {{- if .Values.worker.image }}
-          image: {{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag }}
-          imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
-          {{- else }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- end }}
+          image: {{ include "ray-cluster.image" . }}
+          imagePullPolicy: {{ default .Values.image.pullPolicy .Values.global.image.pullPolicy }}
           {{- with .Values.worker.command }}
           command:
           {{- toYaml . | nindent 10 }}

deployment/helm/datamate/charts/ray-cluster/values.yaml

@@ -77,8 +77,6 @@ head:
       value: "password"
     - name: MYSQL_DATABASE
       value: "datamate"
-    - name: PDF_FORMATTER_BASE_URL
-      value: "http://datamate-mineru:9001"
   # - name: EXAMPLE_ENV
   #   value: "1"
   envFrom: []
@@ -173,8 +171,6 @@ worker:
       value: "password"
     - name: MYSQL_DATABASE
       value: "datamate"
-    - name: PDF_FORMATTER_BASE_URL
-      value: "http://datamate-mineru:9001"
   # - name: EXAMPLE_ENV
   #   value: "1"
   envFrom: []