chore(base-cluster): streamline imagePullPolicy (#757)

teutonet · Feb 16, 2024 · 61f1c7f · 61f1c7f
1 parent 4c469f9
commit 61f1c7f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 40 deletions.
diff --git a/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml b/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml
@@ -23,11 +23,7 @@ spec:
       containers:
         - name: remove-backup-storage-locations
           image: {{ include "common.images.image" (dict "imageRoot" .Values.global.kubectl.image "global" .Values.global) }}
-          {{- if .Values.global.kubectl.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .Values.global.kubectl.image.digest | ternary "Always" "IfNotPresent" }}
           securityContext:
             readOnlyRootFilesystem: true
             privileged: false

diff --git a/charts/base-cluster/templates/flux/_create-authentication-key-secret-job.yaml b/charts/base-cluster/templates/flux/_create-authentication-key-secret-job.yaml
@@ -26,11 +26,7 @@ spec:
       containers:
         - name: generate-ssh-key
           image: {{ template "base-cluster.flux.image" .context }}
-          {{- if .context.Values.global.flux.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .context.Values.global.flux.image.digest | ternary "Always" "IfNotPresent" }}
           securityContext:
             readOnlyRootFilesystem: true
             privileged: false
@@ -52,11 +48,7 @@ spec:
       initContainers:
         - name: generate-gpg-key
           image: {{ template "base-cluster.gpg.image" .context }}
-          {{- if .context.Values.global.gpg.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .context.Values.global.gpg.image.digest | ternary "Always" "IfNotPresent" }}
           env:
             - name: IDENTITY
               value: {{ .identity }}
@@ -94,11 +86,7 @@ spec:
       containers:
         - name: create-k8s-secret
           image: {{ include "base-cluster.kubectl.image" .context }}
-          {{- if .context.Values.global.kubectl.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .context.Values.global.kubectl.image.digest | ternary "Always" "IfNotPresent" }}
           securityContext:
             readOnlyRootFilesystem: true
             privileged: false

diff --git a/charts/base-cluster/templates/global/prevent-uninstallation.yaml b/charts/base-cluster/templates/global/prevent-uninstallation.yaml
@@ -20,11 +20,7 @@ spec:
       containers:
         - name: fail
           image: {{ template "base-cluster.kubectl.image" . }}
-          {{- if .Values.global.kubectl.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .Values.global.kubectl.image.digest | ternary "Always" "IfNotPresent" }}
           securityContext:
             readOnlyRootFilesystem: true
             privileged: false

diff --git a/charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml b/charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml
@@ -31,11 +31,7 @@ spec:
           containers:
             - name: watchdog
               image: {{ template "base-cluster.curl.image" . }}
-              {{- if .Values.global.kubectl.image.digest }}
-              imagePullPolicy: IfNotPresent
-              {{- else }}
-              imagePullPolicy: Always
-              {{- end }}
+              imagePullPolicy: {{ empty .Values.global.kubectl.image.digest | ternary "Always" "IfNotPresent" }}
               securityContext:
                 allowPrivilegeEscalation: false
                 capabilities:

diff --git a/charts/base-cluster/templates/monitoring/deadMansSwitch/registration.yaml b/charts/base-cluster/templates/monitoring/deadMansSwitch/registration.yaml
@@ -22,11 +22,7 @@ spec:
       containers:
         - name: register
           image: {{ include "base-cluster.curl.image" . }}
-          {{- if .Values.global.kubectl.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .Values.global.kubectl.image.digest | ternary "Always" "IfNotPresent" }}
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

diff --git a/charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml b/charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml
@@ -22,11 +22,7 @@ spec:
       containers:
         - name: unregister
           image: {{ include "base-cluster.curl.image" . }}
-          {{- if .Values.global.kubectl.image.digest }}
-          imagePullPolicy: IfNotPresent
-          {{- else }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: {{ empty .Values.global.kubectl.image.digest | ternary "Always" "IfNotPresent" }}
           securityContext:
             allowPrivilegeEscalation: false
             capabilities: