add digest option

aenix-io · Nov 6, 2020 · dd776dd · dd776dd
1 parent 846be3a
commit dd776dd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/deploy/helm/kubefarm/templates/ltsp-deployment.yaml b/deploy/helm/kubefarm/templates/ltsp-deployment.yaml
@@ -51,8 +51,10 @@ spec:
       containers:
 
       - name: config
-        image: {{ .Values.ltsp.image.repository }}:{{ .Values.ltsp.image.tag }}
-        imagePullPolicy: {{ .Values.ltsp.image.PullPolicy }}
+        {{- with .Values.ltsp.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .PullPolicy }}
+        {{- end }}
         command:
         - /bin/sh
         - -c
@@ -69,8 +71,10 @@ spec:
           name: shared
 
       - name: http
-        image: {{ .Values.ltsp.image.repository }}:{{ .Values.ltsp.image.tag }}
-        imagePullPolicy: {{ .Values.ltsp.image.PullPolicy }}
+        {{- with .Values.ltsp.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .PullPolicy }}
+        {{- end }}
         command:
         - /bin/sh
         - -c
@@ -94,7 +98,10 @@ spec:
           name: shared
 
       - name: tftp
-        image: {{ .Values.ltsp.image.repository }}:{{ .Values.ltsp.image.tag }}
+        {{- with .Values.ltsp.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .PullPolicy }}
+        {{- end }}
         imagePullPolicy: {{ .Values.ltsp.image.PullPolicy }}
         command:
         - /bin/sh

diff --git a/deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml b/deploy/helm/kubefarm/templates/ltsp-publisher-job.yaml
@@ -22,8 +22,10 @@ spec:
       {{- end }}
       containers:
       - name: kubeadm
-        image: {{ .Values.kubernetes.admin.image.repository }}:{{ .Values.kubernetes.admin.image.tag }}
-        imagePullPolicy: {{ .Values.kubernetes.admin.image.PullPolicy }}
+        {{- with .Values.kubernetes.admin.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .PullPolicy }}
+        {{- end }}
         command: [ '/scripts/publiship.sh' ]
         env:
         - name: SVC1

diff --git a/deploy/helm/kubefarm/templates/token-generator-job.yaml b/deploy/helm/kubefarm/templates/token-generator-job.yaml
@@ -22,8 +22,10 @@ spec:
       {{- end }}
       containers:
       - name: kubeadm
-        image: {{ .Values.kubernetes.admin.image.repository }}:{{ .Values.kubernetes.admin.image.tag }}
-        imagePullPolicy: {{ .Values.kubernetes.admin.image.PullPolicy }}
+        {{- with .Values.kubernetes.admin.image }}
+        image: "{{ .repository }}{{ if .digest }}@{{ .digest }}{{ else }}:{{ .tag }}{{ end }}"
+        imagePullPolicy: {{ .PullPolicy }}
+        {{- end }}
         command: [ '/scripts/gentoken.sh' ]
         env:
         - name: SVC