From 9968211163545ed73d2299ca12ab4afda74e37dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 13:00:45 +0800 Subject: [PATCH] add imagePullSecrets for helm templates to support private docker registry (#3129) Signed-off-by: StevenLeiZhang (cherry picked from commit cf9eb0ded90dfc562a3713ff964582cdd39cba69) Co-authored-by: StevenLeiZhang --- .../admission-webhooks/job-patch/job-createSecret.yaml | 4 ++++ .../admission-webhooks/job-patch/job-patchWebhook.yaml | 4 ++++ charts/vela-core/templates/cluster-gateway.yaml | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml index b792c2c44..aa431b809 100644 --- a/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml @@ -22,6 +22,10 @@ spec: app: {{ template "kubevela.name" . }}-admission-create {{- include "kubevela.labels" . | nindent 8 }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: create image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }} diff --git a/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml index 35f66e40c..c6b9f25ea 100644 --- a/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -22,6 +22,10 @@ spec: app: {{ template "kubevela.name" . }}-admission-patch {{- include "kubevela.labels" . | nindent 8 }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: patch image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }} diff --git a/charts/vela-core/templates/cluster-gateway.yaml b/charts/vela-core/templates/cluster-gateway.yaml index 13b79c121..ffb04ad9e 100644 --- a/charts/vela-core/templates/cluster-gateway.yaml +++ b/charts/vela-core/templates/cluster-gateway.yaml @@ -198,6 +198,10 @@ spec: app: {{ template "kubevela.fullname" . }}-cluster-gateway-tls-secret-create {{- include "kubevela.labels" . | nindent 8 }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: create image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }} @@ -241,6 +245,10 @@ spec: app: {{ template "kubevela.fullname" . }}-cluster-gateway-tls-secret-patch {{- include "kubevela.labels" . | nindent 8 }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: patch image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}