From eda28d0df099162664a376f14eaf8f54e3174ec7 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Thu, 31 Oct 2024 12:07:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4helm=E7=9A=84?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E4=BD=BF=E5=85=B6=E6=94=AF=E6=8C=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AEimageRegistry=20#11171?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kubernetes-management/templates/deployment.yaml | 2 +- .../core/ci/local_chart/kubernetes-management/values.yaml | 5 ++++- 2 files changed, 5 insertions(+), 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 index cc3ea179992..c33db167c18 100644 --- 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 index eae87f54fb6..a67430a5b30 100644 --- 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