Merge pull request #137 from MediaMarktSaturn/mhaxp-image.tag

Add .values.image.hash to application helm chart
MediaMarktSaturn · Jul 22, 2024 · ce1f701 · ce1f701
2 parents f132593 + 41fe65f
commit ce1f701
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 11 deletions.
diff --git a/chart-tests/application/ci/test-image-sha-values.yaml b/chart-tests/application/ci/test-image-sha-values.yaml
@@ -0,0 +1,11 @@
+resources:
+  requests:
+    cpu: 10m
+    memory: 50Mi
+  limits:
+    cpu: 100m
+    memory: 100Mi
+
+image:
+  digest: sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f
+  tag:
diff --git a/chart-tests/application/ci/test-resources-and-label-values.yaml b/chart-tests/application/ci/test-resources-and-label-values.yaml
@@ -14,7 +14,7 @@ autoscaling:
 
 image:
   repository: quay.io/heubeck/examiner
-  tag: 1.12.21
+  tag: 1.13.1
   pullPolicy: IfNotPresent
 
   # ImagePolicy and check period for automated updates

diff --git a/chart-tests/application/ci/test-sidecar-values.yaml b/chart-tests/application/ci/test-sidecar-values.yaml
@@ -14,7 +14,7 @@ sidecars:
   - name: sidekick
     image:
       repository: quay.io/heubeck/examiner
-      tag: 1.12.21
+      tag: 1.13.1
     env:
       ECHO_VALUE: yehaaa
       QUARKUS_HTTP_PORT: 9090
@@ -31,7 +31,7 @@ sidecars:
   - name: kickback
     image:
       repository: quay.io/heubeck/examiner
-      tag: 1.12.21
+      tag: 1.13.1
     env:
       ECHO_VALUE: wohooo
       QUARKUS_HTTP_PORT: 7070

diff --git a/chart-tests/application/ci/test-statefulset-sidecar-values.yaml b/chart-tests/application/ci/test-statefulset-sidecar-values.yaml
@@ -17,7 +17,7 @@ sidecars:
   - name: sidekick
     image:
       repository: quay.io/heubeck/examiner
-      tag: 1.12.21
+      tag: 1.13.1
     env:
       ECHO_VALUE: yehaaa
       QUARKUS_HTTP_PORT: 9090
@@ -34,7 +34,7 @@ sidecars:
   - name: kickback
     image:
       repository: quay.io/heubeck/examiner
-      tag: 1.12.21
+      tag: 1.13.1
     env:
       ECHO_VALUE: wohooo
       QUARKUS_HTTP_PORT: 7070

diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
   - name: MediaMarktSaturn
     url: https://github.com/MediaMarktSaturn
 appVersion: 1.0.0
-version: 1.20.1
+version: 1.21.0
diff --git a/charts/application/README.md b/charts/application/README.md
@@ -39,7 +39,8 @@ Generic application chart with common requirements of a typical workload.
 | readinessProbe.failureThreshold | int | `3` |  |
 | readinessProbe.timeoutSeconds | int | `5` |  |
 | image.repository | string | `"quay.io/heubeck/examiner"` |  |
-| image.tag | string | `"1.12.21"` |  |
+| image.tag | string | `"1.13.1"` |  |
+| image.digest | string | `nil` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.tagSemverRange | string | `nil` |  |
 | image.tagNumerical | string | `nil` |  |

diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl
@@ -51,7 +51,11 @@ spec:
   initContainers: {{ if not .Values.initContainers -}}[]{{- end -}}
     {{- range $i := .Values.initContainers }}
     - name: {{ $i.name }}
+      {{- if .image.digest }}
+      image: "{{ .image.repository }}@{{ .image.digest }}"
+      {{- else }}
       image: "{{ .image.repository }}:{{ .image.tag }}"
+      {{- end }}
       imagePullPolicy: {{ or $i.image.pullPolicy $.Values.initDefaults.image.pullPolicy }}
       command: {{ if not $i.command }}[]{{ end }}
         {{- range $i.command }}
@@ -107,7 +111,11 @@ spec:
   containers:
     {{- range $s := .Values.sidecars }}
     - name: {{ $s.name }}
+      {{- if .image.digest }}
+      image: "{{ .image.repository }}@{{ .image.digest }}"
+      {{- else }}
       image: "{{ .image.repository }}:{{ .image.tag }}"
+      {{- end }}
       imagePullPolicy: {{ or $s.image.pullPolicy $.Values.sidecarDefaults.image.pullPolicy }}
       args: {{ if not $s.args }}[]{{ end }}
         {{- range $s.args }}
@@ -195,7 +203,11 @@ spec:
       securityContext:
         {{- toYaml .Values.container.securityContext | nindent 8 }}
       {{- end }}
+      {{- if .Values.image.digest }}
+      image: "{{ .Values.image.repository }}@{{ .Values.image.digest }}"
+      {{- else }}
       image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+      {{- end }}
       imagePullPolicy: {{ .Values.image.pullPolicy }}
       args: {{ if not .Values.container.args }}[]{{ end }}
         {{- range .Values.container.args }}

diff --git a/charts/application/templates/flux-image-policy.yaml b/charts/application/templates/flux-image-policy.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.image.tagUpdateInterval (or .Values.image.tagSemverRange (has .Values.image.tagNumerical (list "asc" "desc")) (has .Values.image.tagAlphabetical (list "asc" "desc")) ) }}
+{{- if and .Values.image.tagUpdateInterval (or .Values.image.tagSemverRange (has .Values.image.tagNumerical (list "asc" "desc")) (has .Values.image.tagAlphabetical (list "asc" "desc")) ) (not .Values.image.digest ) }}
 {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }}
 apiVersion: image.toolkit.fluxcd.io/v1beta2
 {{- else }}

diff --git a/charts/application/templates/flux-image-repository.yaml b/charts/application/templates/flux-image-repository.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.image.tagUpdateInterval (or .Values.image.tagSemverRange .Values.image.tagNumerical .Values.image.tagAlphabetical ) }}
+{{- if and .Values.image.tagUpdateInterval (or .Values.image.tagSemverRange .Values.image.tagNumerical .Values.image.tagAlphabetical ) (not .Values.image.digest) }}
 {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }}
 apiVersion: image.toolkit.fluxcd.io/v1beta2
 {{- else }}

diff --git a/charts/application/values.yaml b/charts/application/values.yaml
@@ -55,7 +55,10 @@ readinessProbe:
 
 image:
   repository: quay.io/heubeck/examiner
-  tag: 1.12.21
+  tag: 1.13.1
+  # When image.digest is set the image.tag, imagepolicy and imagerepository is ignored
+  # e.g. "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f"
+  digest:
   pullPolicy: IfNotPresent
 
   # ImagePolicy options:
@@ -303,7 +306,7 @@ sidecars: []
 # - name: sqlproxy
 #   image:
 #     repository: quay.io/heubeck/examiner
-#     tag: 1.12.21
+#     tag: 1.13.1
 #   args: []
 #   env: {}
 #   configEnvFrom: []