add digest option

Author: kvaps

deploy/helm/kubernetes/manifests/konnectivity-agent-deployment.yaml

@@ -44,10 +44,12 @@ spec:
       {{- toYaml . | nindent 6 }}
       {{- end }}
       containers:
-      - image: {{ .Values.konnectivityAgent.image.repository }}:{{ .Values.konnectivityAgent.image.tag }}
-        name: konnectivity-agent
-        command: ["/proxy-agent"]
-        args:
+      - name: konnectivity-agent
+        {{- with .Values.konnectivityAgent.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
+        command:
+        - /proxy-agent
         - --logtostderr=true
         - --ca-cert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         - --service-account-token-path=/var/run/secrets/tokens/konnectivity-agent-token

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

@@ -51,7 +51,9 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - command: [ 'sleep', 'infinity' ]
-        image: {{ .Values.admin.image.repository }}:{{ .Values.admin.image.tag }}
+        {{- with .Values.admin.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.admin.image.PullPolicy }}
         name: admin
         livenessProbe:

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

@@ -96,7 +96,9 @@ spec:
         ports:
         - containerPort: {{ .Values.apiServer.port }}
           name: client
-        image: {{ .Values.apiServer.image.repository }}:{{ .Values.apiServer.image.tag }}
+        {{- with .Values.apiServer.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.apiServer.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8

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

@@ -69,7 +69,9 @@ spec:
         {{- range $key, $value := .Values.controllerManager.extraArgs }}
         - --{{ $key }}={{ $value }}
         {{- end }}
-        image: {{ .Values.controllerManager.image.repository }}:{{ .Values.controllerManager.image.tag }}
+        {{- with .Values.controllerManager.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.controllerManager.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8

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

@@ -95,7 +95,9 @@ spec:
         {{- with .Values.etcd.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        image: {{ .Values.etcd.image.repository }}:{{ .Values.etcd.image.tag }}
+        {{- with .Values.etcd.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         ports:
         - containerPort: {{ .Values.etcd.ports.client }}
           name: client

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

@@ -80,7 +80,9 @@ spec:
           name: admin
         - containerPort: {{ .Values.konnectivityServer.ports.health }}
           name: health
-        image: {{ .Values.konnectivityServer.image.repository }}:{{ .Values.konnectivityServer.image.tag }}
+        {{- with .Values.konnectivityServer.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.konnectivityServer.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8

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

@@ -51,7 +51,9 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: kubeadm
-        image: {{ .Values.admin.image.repository }}:{{ .Values.admin.image.tag }}
+        {{- with .Values.admin.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.admin.image.PullPolicy }}
         command: [ '/scripts/configure-cluster.sh' ]
         env:

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

@@ -60,7 +60,9 @@ spec:
         {{- range $key, $value := .Values.scheduler.extraArgs }}
         - --{{ $key }}={{ $value }}
         {{- end }}
-        image: {{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag }}
+        {{- with .Values.scheduler.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        {{- end }}
         imagePullPolicy: {{ .Values.scheduler.image.PullPolicy }}
         livenessProbe:
           failureThreshold: 8