bugfix: 支持使用runtime单实例 (#118)

* bugfix: 支持使用runtime单实例

deployment/helm/milvus/charts/etcd/charts/common/templates/_images.tpl

@@ -18,7 +18,7 @@ Return the proper image name
     {{- $termination = .imageRoot.digest | toString -}}
 {{- end -}}
 {{- if $registryName }}
-    {{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}}
+    {{- printf "%s/%s%s%s" ($registryName | trimSuffix "/") $repositoryName $separator $termination -}}
 {{- else -}}
     {{- printf "%s%s%s"  $repositoryName $separator $termination -}}
 {{- end -}}

deployment/helm/milvus/charts/etcd/templates/deployment.yaml

@@ -15,7 +15,8 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
-  strategy: {{- include "common.tplvalues.render" (dict "value" .Values.updateStrategy "context" $ ) | nindent 4 }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}

deployment/helm/milvus/charts/minio/templates/deployment.yaml

@@ -72,7 +72,11 @@ spec:
 {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.global.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          {{- if .Values.global.imageRegistry }}
+          image: "{{ .Values.global.imageRegistry | trimSuffix "/" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          {{- else }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.s3gateway.enabled }}
           command:

deployment/helm/milvus/templates/_helpers.tpl

@@ -246,3 +246,13 @@ false
     {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{- define "runtime.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 }}

deployment/helm/milvus/templates/standalone-deployment.yaml

@@ -49,7 +49,7 @@ spec:
         - /bin/bash
         - -c
         - "cp -r /opt/heaptrack /milvus/tools"
-        image: "{{ .Values.heaptrack.image.repository }}:{{ .Values.heaptrack.image.tag }}"
+        image: "{{ .Values.global.imageRegistry | trimSuffix "/" }}/{{ .Values.heaptrack.image.repository }}:{{ .Values.heaptrack.image.tag }}"
         imagePullPolicy: {{ .Values.heaptrack.image.pullPolicy }}
         {{ if and (.Values.containerSecurityContext) (not .Values.standalone.containerSecurityContext) }}
         securityContext:
@@ -65,7 +65,11 @@ spec:
       {{- end }}
       containers:
       - name: standalone
+        {{- if .Values.global.imageRegistry }}
+        image: "{{ .Values.global.imageRegistry | trimSuffix "/" }}/{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}"
+        {{- else }}
         image: "{{ .Values.image.all.repository }}:{{ .Values.image.all.tag }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.image.all.pullPolicy }}
         {{ if and (.Values.containerSecurityContext) (not .Values.standalone.containerSecurityContext) }}
         securityContext: