registrySecrets

templates/chartmuseum/chartmuseum-dpl.yaml

@@ -35,6 +35,10 @@ spec:
 {{ toYaml .Values.chartmuseum.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 10000
 {{- if .Values.chartmuseum.serviceAccountName }}

templates/clair/clair-dpl.yaml

@@ -28,6 +28,10 @@ spec:
 {{ toYaml .Values.clair.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 10000
 {{- if .Values.clair.serviceAccountName }}

templates/core/core-dpl.yaml

@@ -29,6 +29,10 @@ spec:
 {{ toYaml .Values.core.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 10000
 {{- if .Values.core.serviceAccountName }}

templates/database/database-ss.yaml

@@ -25,6 +25,10 @@ spec:
 {{ toYaml .Values.database.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
 {{- if .Values.database.internal.serviceAccountName }}
       serviceAccountName: {{ .Values.database.internal.serviceAccountName }}
 {{- end -}}

templates/imagePullSecret.yaml

+{{- if .Values.registrySecrets -}}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: beagle-registry
+  namespace: {{ .Release.Namespace}}
+data:
+  .dockerconfigjson: ewoJImF1dGhzIjogewoJCSJyZWdpc3RyeS5iZWFnbGUuZGVmYXVsdDo2NDQ0IjogewoJCQkiYXV0aCI6ICJZbVZoWjJ4bE9tSmxZV2RzWlE9PSIKCQl9Cgl9Cn0=
+type: kubernetes.io/dockerconfigjson
+{{- end -}}
\ No newline at end of file

templates/jobservice/jobservice-dpl.yaml

@@ -35,6 +35,10 @@ spec:
 {{ toYaml .Values.jobservice.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 10000
 {{- if .Values.jobservice.serviceAccountName }}

templates/nginx/deployment.yaml

@@ -30,6 +30,10 @@ spec:
 {{ toYaml .Values.nginx.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
 {{- if .Values.nginx.serviceAccountName }}
       serviceAccountName: {{ .Values.nginx.serviceAccountName }}
 {{- end }}

templates/notary/notary-server.yaml

@@ -24,6 +24,10 @@ spec:
 {{ toYaml .Values.notary.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 10000
 {{- if .Values.notary.server.serviceAccountName }}

templates/portal/deployment.yaml

@@ -26,6 +26,10 @@ spec:
 {{ toYaml .Values.portal.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

templates/redis/statefulset.yaml

@@ -24,6 +24,10 @@ spec:
 {{ toYaml .Values.redis.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 999
 {{- if .Values.redis.internal.serviceAccountName }}

templates/registry/registry-dpl.yaml

@@ -35,6 +35,10 @@ spec:
 {{ toYaml .Values.registry.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
       securityContext:
         fsGroup: 10000
 {{- if .Values.registry.serviceAccountName }}

templates/trivy/trivy-sts.yaml

@@ -30,6 +30,10 @@ spec:
 {{ toYaml .Values.trivy.podAnnotations | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+{{- end }}
 {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

values-operator.yaml

@@ -2,4 +2,8 @@ global:
   hub: registry.cn-qingdao.aliyuncs.com/wod
   imagePullPolicy: "IfNotPresent"
   imageArch: amd64
-  host: wodcloud.local
+  host: wodcloud.local
\ No newline at end of file
+  imagePullSecrets:
+    - name: beagle-registry
+
+registrySecrets: true
\ No newline at end of file