feat: 调整helm的镜像使其支持配置imageRegistry TencentBlueKing#11171

stubenhuang · Oct 31, 2024 · eda28d0 · eda28d0
1 parent 7540206
commit eda28d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/templates/deployment.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/templates/deployment.yaml
@@ -109,7 +109,7 @@ spec:
           {{- end}}
         {{- if .Values.kubernetesManager.docker.enable }}
         - name: kuberentes-manager-docker
-          image: {{ .Values.kubernetesManager.docker.image }}
+          image: "{{ .Values.kubernetesManager.docker.image.registry }}/{{ .Values.kubernetesManager.docker.image.repository }}:{{ .Values.kubernetesManager.docker.image.tag }}"
           command: ["dockerd", "--host", "tcp://localhost:2375"]
           {{- if .Values.kubernetesManager.docker.resources }}
           resources: {{- toYaml .Values.kubernetesManager.docker.resources | nindent 12 }}

diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml
@@ -159,7 +159,10 @@ kubernetesManager:
   # manager使用docker相关配置，会启用特权模式容器
   docker:
     enable: false
-    image: docker:24.0.1-dind
+    image: 
+      registry: registry-1.docker.io
+      repository: docker
+      tag: 24.0.1-dind
     resources:
       requests:
         cpu: 50m