[bitnami/harbor] Standardize imagePullSecrets on every deployment

Signed-off-by: juan131 <juan@bitnami.com>

bitnami/harbor/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: harbor
-version: 2.5.3
+version: 2.5.4
 appVersion: 1.8.1
 description: Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content
 keywords:

bitnami/harbor/templates/_helpers.tpl

@@ -568,7 +568,7 @@ imagePullSecrets:
 {{- range .Values.global.imagePullSecrets }}
   - name: {{ . }}
 {{- end }}
-{{- else if or .Values.harbor.coreImage.pullSecrets .Values.portalImage.pullSecrets .Values.jobserviceImage.pullSecrets .Values.registryImage.pullSecrets .Values.registryctlImage.pullSecrets .Values.nginxImage.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+{{- else if or .Values.harbor.coreImage.pullSecrets .Values.portalImage.pullSecrets .Values.jobserviceImage.pullSecrets .Values.notaryServerImage.pullSecrets .Values.notarySignerImage.pullSecrets .Values.registryImage.pullSecrets .Values.registryctlImage.pullSecrets .Values.nginxImage.pullSecrets .Values.volumePermissions.image.pullSecrets }}
 imagePullSecrets:
 {{- range .Values.harbor.coreImage.pullSecrets }}
   - name: {{ . }}
@@ -579,6 +579,12 @@ imagePullSecrets:
 {{- range .Values.jobserviceImage.pullSecrets }}
   - name: {{ . }}
 {{- end }}
+{{- range .Values.notaryServerImage.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.notarySignerImage.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
 {{- range .Values.registryImage.pullSecrets }}
   - name: {{ . }}
 {{- end }}
@@ -592,7 +598,7 @@ imagePullSecrets:
   - name: {{ . }}
 {{- end }}
 {{- end -}}
-{{- else if or .Values.harbor.coreImage.pullSecrets .Values.portalImage.pullSecrets .Values.jobserviceImage.pullSecrets .Values.registryImage.pullSecrets .Values.registryctlImage.pullSecrets .Values.nginxImage.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+{{- else if or .Values.harbor.coreImage.pullSecrets .Values.portalImage.pullSecrets .Values.jobserviceImage.pullSecrets .Values.notaryServerImage.pullSecrets .Values.notarySignerImage.pullSecrets .Values.registryImage.pullSecrets .Values.registryctlImage.pullSecrets .Values.nginxImage.pullSecrets .Values.volumePermissions.image.pullSecrets }}
 imagePullSecrets:
 {{- range .Values.harbor.coreImage.pullSecrets }}
   - name: {{ . }}
@@ -603,6 +609,12 @@ imagePullSecrets:
 {{- range .Values.jobserviceImage.pullSecrets }}
   - name: {{ . }}
 {{- end }}
+{{- range .Values.notaryServerImage.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.notarySignerImage.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
 {{- range .Values.registryImage.pullSecrets }}
   - name: {{ . }}
 {{- end }}

bitnami/harbor/templates/chartmuseum/chartmuseum-dpl.yaml

@@ -24,6 +24,7 @@ spec:
         {{ toYaml .Values.chartmuseum.podAnnotations | indent 8 }}
         {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
@@ -42,10 +43,6 @@ spec:
       - name: chartmuseum
         image: "{{ template "harbor.chartMuseumImage" . }}"
         imagePullPolicy: {{ .Values.chartMuseumImage.imagePullPolicy | quote }}
-        imagePullSecrets:
-        {{- range .Values.chartMuseumImage.pullSecrets }}
-          - name: {{ . }}
-        {{- end }}
         {{- if .Values.chartmuseum.livenessProbe.enabled }}
         livenessProbe:
           httpGet:

bitnami/harbor/templates/clair/clair-dpl.yaml

@@ -22,6 +22,7 @@ spec:
         {{ toYaml .Values.clair.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

bitnami/harbor/templates/core/core-dpl.yaml

@@ -25,6 +25,7 @@ spec:
         {{- toYaml .Values.core.podAnnotations | nindent 8 }}
         {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}

bitnami/harbor/templates/jobservice/jobservice-dpl.yaml

@@ -23,6 +23,7 @@ spec:
         {{ toYaml .Values.jobservice.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}

bitnami/harbor/templates/nginx/deployment.yaml

@@ -29,6 +29,7 @@ spec:
         {{ toYaml .Values.nginx.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}

bitnami/harbor/templates/notary/notary-server.yaml

@@ -21,6 +21,7 @@ spec:
         {{ toYaml .Values.notary.podAnnotations | nindent 8 }}
         {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}

bitnami/harbor/templates/notary/notary-signer.yaml

@@ -17,6 +17,7 @@ spec:
       annotations:
         checksum/configmap: {{ include (print $.Template.BasePath "/notary/notary-cm.yaml") . | sha256sum }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}

bitnami/harbor/templates/portal/portal-dpl.yaml

@@ -20,6 +20,7 @@ spec:
         {{ toYaml .Values.portal.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}

bitnami/harbor/templates/registry/registry-dpl.yaml

@@ -24,6 +24,7 @@ spec:
         {{ toYaml .Values.registry.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
+{{- include "harbor.imagePullSecrets" . | indent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}