diff --git a/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml b/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml index c2a930b027a..1b2f4b6f60f 100644 --- a/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml +++ b/helm-charts/core/ci/local_chart/kubernetes-management/templates/kubernetes-manager-configmap.yaml @@ -119,7 +119,7 @@ data: logPath: /data/devops/logs builderConfigMapPath: /data/devops/config buildAndPushImage: - image: {{ .Values.kubernetesManager.buildAndPushImage.image }} + image: {{ .Values.kubernetesManager.buildAndPushImage.image.registry }}/{{ .Values.kubernetesManager.buildAndPushImage.image.repository }}:{{ .Values.kubernetesManager.buildAndPushImage.image.tag }} # 拉取kaniko需要的凭据,如果不填视为没有 pullImageRegistry: server: {{ .Values.kubernetesManager.buildAndPushImage.server }} 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 a67430a5b30..a087cc098e6 100644 --- a/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml +++ b/helm-charts/core/ci/local_chart/kubernetes-management/values.yaml @@ -139,12 +139,23 @@ kubernetesManager: prometheusUrl: # 构建并推送镜像相关 buildAndPushImage: - image: gcr.io/kaniko-project/executor:v1.9.0 + # gcr.io/kaniko-project/executor:v1.9.0 + image: + registry: gcr.io + repository: kaniko-project/executor + tag: v1.9.0 # 拉取kaniko需要的凭据,如果不填视为没有 pullImageRegistry: server: username: password: + # 无编译构建机 + buildlessDeployment: + # bkci/ci:latest + image: + registry: registry-1.docker.io/bkci + repository: ci + tag: latest apiserver: auth: # 针对蓝盾流水线访问的超级权限token diff --git a/helm-charts/core/ci/templates/init/init.defaultImages.yaml b/helm-charts/core/ci/templates/init/init.defaultImages.yaml index e37e8ecf506..84458067096 100644 --- a/helm-charts/core/ci/templates/init/init.defaultImages.yaml +++ b/helm-charts/core/ci/templates/init/init.defaultImages.yaml @@ -37,6 +37,6 @@ spec: done echo "{{ include "bkci.names.fullname" . }}-store is available"; - curl "http://{{ include "bkci.names.fullname" . }}-store.{{ .Release.Namespace }}.svc.cluster.local/api/op/market/image/init" -X POST -d '{"imageRepoName":"{{ .Values.defaultImage.image.registry }}/{{ .Values.defaultImage.image.repository }}" , "imageTag":"{{ .Values.defaultImage.image.tag }}"}' + curl "http://{{ include "bkci.names.fullname" . }}-store.{{ .Release.Namespace }}.svc.cluster.local/api/op/market/image/init" -X POST -d '{"imageRepoName":"{{ .Values.init.defaultImage.image.registry }}/{{ .Values.init.defaultImage.image.repository }}" , "imageTag":"{{ .Values.init.defaultImage.image.tag }}"}' restartPolicy: OnFailure {{- end -}}