upd .pullPolicy and .pullSecrets

Author: kvaps

deploy/helm/kubernetes/templates/admin-deployment.yaml

@@ -43,7 +43,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.admin.image.PullSecrets }}
+      {{- with .Values.admin.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -53,8 +53,8 @@ spec:
       - command: [ 'sleep', 'infinity' ]
         {{- with .Values.admin.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
-        imagePullPolicy: {{ .Values.admin.image.PullPolicy }}
         name: admin
         readinessProbe:
           exec:

deploy/helm/kubernetes/templates/apiserver-deployment.yaml

@@ -45,7 +45,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.apiServer.image.PullSecrets }}
+      {{- with .Values.apiServer.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -98,8 +98,8 @@ spec:
           name: client
         {{- with .Values.apiServer.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
-        imagePullPolicy: {{ .Values.apiServer.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8
           httpGet:

deploy/helm/kubernetes/templates/controller-manager-deployment.yaml

@@ -43,7 +43,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.controllerManager.image.PullSecrets }}
+      {{- with .Values.controllerManager.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -73,8 +73,8 @@ spec:
         {{- end }}
         {{- with .Values.controllerManager.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
-        imagePullPolicy: {{ .Values.controllerManager.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8
           httpGet:

deploy/helm/kubernetes/templates/etcd-statefulset.yaml

@@ -47,7 +47,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
 
-      {{- with .Values.etcd.image.PullSecrets }}
+      {{- with .Values.etcd.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -97,6 +97,7 @@ spec:
         {{- end }}
         {{- with .Values.etcd.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
         ports:
         - containerPort: {{ .Values.etcd.ports.client }}
@@ -105,7 +106,6 @@ spec:
           name: peer
         - containerPort: {{ .Values.etcd.ports.metrics }}
           name: metrics
-        imagePullPolicy: {{ .Values.etcd.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8
           httpGet:

deploy/helm/kubernetes/templates/konnectivity-server-deployment.yaml

@@ -43,7 +43,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.konnectivityServer.image.PullSecrets }}
+      {{- with .Values.konnectivityServer.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -82,7 +82,7 @@ spec:
           name: health
         {{- with .Values.konnectivityServer.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
-        imagePullPolicy: {{ .PullPolicy }}
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
         livenessProbe:
           failureThreshold: 8

deploy/helm/kubernetes/templates/kubeadm-job.yaml

@@ -43,7 +43,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.admin.image.PullSecrets }}
+      {{- with .Values.admin.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -53,8 +53,8 @@ spec:
       - name: kubeadm
         {{- with .Values.admin.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
-        imagePullPolicy: {{ .Values.admin.image.PullPolicy }}
         command: [ '/scripts/configure-cluster.sh' ]
         env:
         - name: KUBECONFIG

deploy/helm/kubernetes/templates/scheduler-deployment.yaml

@@ -43,7 +43,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.scheduler.image.PullSecrets }}
+      {{- with .Values.scheduler.image.pullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 10 }}
       {{- end }}
@@ -64,8 +64,8 @@ spec:
         {{- end }}
         {{- with .Values.scheduler.image }}
         image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .pullPolicy }}
         {{- end }}
-        imagePullPolicy: {{ .Values.scheduler.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8
           httpGet:

deploy/helm/kubernetes/values.yaml

@@ -15,8 +15,8 @@ etcd:
   image:
     repository: k8s.gcr.io/etcd
     tag: 3.4.9-1
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 3
   resources:
     requests:
@@ -65,8 +65,8 @@ apiServer:
   image:
     repository: k8s.gcr.io/kube-apiserver
     tag: v1.20.2
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -112,8 +112,8 @@ controllerManager:
   image:
     repository: k8s.gcr.io/kube-controller-manager
     tag: v1.20.2
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -150,8 +150,8 @@ scheduler:
   image:
     repository: k8s.gcr.io/kube-scheduler
     tag: v1.20.2
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -188,8 +188,8 @@ admin:
   image:
     repository: docker.io/kvaps/kubernetes-tools
     tag: v1.20.2
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 1
   resources:
     requests:
@@ -228,8 +228,8 @@ konnectivityServer:
   image:
     repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-server
     tag: v0.0.12
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   resources:
     requests:
@@ -277,8 +277,8 @@ konnectivityAgent:
   image:
     repository: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent
     tag: v0.0.12
-    PullPolicy: IfNotPresent
-    PullSecrets: []
+    pullPolicy: IfNotPresent
+    pullSecrets: []
   replicaCount: 2
   hostNetwork: true