Merge pull request #11181 from stubenhuang/issue-imageRegistry-11171

feat: 调整helm的镜像使其支持配置imageRegistry #11171
TencentBlueKing · Nov 1, 2024 · 5a19117 · 5a19117
2 parents 4d07110 + dffc77c
commit 5a19117
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...rts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml b/...rts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml
@@ -99,7 +99,7 @@ data:
       deploymentReplicas: 2
       # deployment配置
       buildlessDeployment:
-        image: bkci/ci:latest
+        image: {{ include "common.images.image" ( dict "imageRoot" .Values.kubernetesManager.buildlessDeployment.image "global" .Values.global) }}
         replicas: 2
         volume:
           # 构建机脚本
@@ -119,7 +119,7 @@ data:
           logPath: /data/devops/logs
           builderConfigMapPath: /data/devops/config
     buildAndPushImage:
-      image: {{ .Values.kubernetesManager.buildAndPushImage.image.registry }}/{{ .Values.kubernetesManager.buildAndPushImage.image.repository }}:{{ .Values.kubernetesManager.buildAndPushImage.image.tag }}
+      image: {{ include "common.images.image" ( dict "imageRoot" .Values.kubernetesManager.buildAndPushImage.image "global" .Values.global) }}
       # 拉取kaniko需要的凭据，如果不填视为没有
       pullImageRegistry: 
         server: {{ .Values.kubernetesManager.buildAndPushImage.server }}

diff --git a/helm-charts/core/ci/templates/configmap/stream-configmap.yaml b/helm-charts/core/ci/templates/configmap/stream-configmap.yaml
@@ -1,5 +1,6 @@
 #stream configmap
 {{ if .Values.configmap.enabled -}}
+{{ if .Values.stream.enabled -}}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -16,3 +17,4 @@ data:
   application.yml: |-
     {{- include "bkci.stream.yaml" . | nindent 4 -}}
 {{- end -}}
+{{- end -}}