From 5c7f4228a088e56b85bd49cd648daf99a27f1399 Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:38:04 +0200 Subject: [PATCH 01/22] Update _podTemplate.tpl --- charts/application/templates/_podTemplate.tpl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl index ceb3d72..7ef49bb 100644 --- a/charts/application/templates/_podTemplate.tpl +++ b/charts/application/templates/_podTemplate.tpl @@ -52,6 +52,9 @@ spec: {{- range $i := .Values.initContainers }} - name: {{ $i.name }} image: "{{ .image.repository }}:{{ .image.tag }}" + {{- else }} + image: "{{ .image.repository }}@{{ .image.hash }}" + {{- end }} imagePullPolicy: {{ or $i.image.pullPolicy $.Values.initDefaults.image.pullPolicy }} command: {{ if not $i.command }}[]{{ end }} {{- range $i.command }} @@ -107,7 +110,11 @@ spec: containers: {{- range $s := .Values.sidecars }} - name: {{ $s.name }} + {{- if .Values.tag }} image: "{{ .image.repository }}:{{ .image.tag }}" + {{- else }} + image: "{{ .image.repository }}@{{ .image.hash }}" + {{- end }} imagePullPolicy: {{ or $s.image.pullPolicy $.Values.sidecarDefaults.image.pullPolicy }} args: {{ if not $s.args }}[]{{ end }} {{- range $s.args }} @@ -195,7 +202,11 @@ spec: securityContext: {{- toYaml .Values.container.securityContext | nindent 8 }} {{- end }} + {{- if .Values.tag }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + {{- else }} + image: "{{ .Values.image.repository }}@{{ .Values.image.hash }}" + {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: {{ if not .Values.container.args }}[]{{ end }} {{- range .Values.container.args }} From b6e35d320c42ee7a95cce8ba06995a634ccd07be Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:41:44 +0200 Subject: [PATCH 02/22] Update flux-image-repository.yaml --- charts/application/templates/flux-image-repository.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-repository.yaml b/charts/application/templates/flux-image-repository.yaml index 8d6d015..e150b97 100644 --- 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 )) and not .Values.image.hash }} {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }} apiVersion: image.toolkit.fluxcd.io/v1beta2 {{- else }} From 87ce6141f8c5a15ea60bf3696cad35d7a8d66f7e Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:43:42 +0200 Subject: [PATCH 03/22] Update flux-image-policy.yaml --- charts/application/templates/flux-image-policy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-policy.yaml b/charts/application/templates/flux-image-policy.yaml index 5a382cd..3fae140 100644 --- 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")) )) and not .Values.image.tag }} {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }} apiVersion: image.toolkit.fluxcd.io/v1beta2 {{- else }} From 2a056f392e8945c1341cd6d91a94ebe19b77065b Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:46:16 +0200 Subject: [PATCH 04/22] Update README.md --- charts/application/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/application/README.md b/charts/application/README.md index 60c2c58..533ac24 100644 --- a/charts/application/README.md +++ b/charts/application/README.md @@ -40,6 +40,7 @@ Generic application chart with common requirements of a typical workload. | readinessProbe.timeoutSeconds | int | `5` | | | image.repository | string | `"quay.io/heubeck/examiner"` | | | image.tag | string | `"1.12.21"` | | +| image.hash | string | `"sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f"` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.tagSemverRange | string | `nil` | | | image.tagNumerical | string | `nil` | | From a06308d20f91538013276282d0a46d9952fd1017 Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:47:42 +0200 Subject: [PATCH 05/22] Update values.yaml --- charts/application/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/application/values.yaml b/charts/application/values.yaml index 828804a..854b5cf 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -56,6 +56,9 @@ readinessProbe: image: repository: quay.io/heubeck/examiner tag: 1.12.21 + # When hash is set image.tag, imagepolicy and imagerepository is ignored + hash: "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" + pullPolicy: IfNotPresent # ImagePolicy options: From f76e969772adc360de1a21324af58eb26298bc14 Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:52:38 +0200 Subject: [PATCH 06/22] Update _podTemplate.tpl --- charts/application/templates/_podTemplate.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl index 7ef49bb..bca8aa0 100644 --- a/charts/application/templates/_podTemplate.tpl +++ b/charts/application/templates/_podTemplate.tpl @@ -51,6 +51,7 @@ spec: initContainers: {{ if not .Values.initContainers -}}[]{{- end -}} {{- range $i := .Values.initContainers }} - name: {{ $i.name }} + {{- if .image.tag }} image: "{{ .image.repository }}:{{ .image.tag }}" {{- else }} image: "{{ .image.repository }}@{{ .image.hash }}" @@ -110,7 +111,7 @@ spec: containers: {{- range $s := .Values.sidecars }} - name: {{ $s.name }} - {{- if .Values.tag }} + {{- if .image.tag }} image: "{{ .image.repository }}:{{ .image.tag }}" {{- else }} image: "{{ .image.repository }}@{{ .image.hash }}" @@ -202,7 +203,7 @@ spec: securityContext: {{- toYaml .Values.container.securityContext | nindent 8 }} {{- end }} - {{- if .Values.tag }} + {{- if .Values.image.tag }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" {{- else }} image: "{{ .Values.image.repository }}@{{ .Values.image.hash }}" From 349da5c7fc00ed5b58d727cc1e6cbf97b231c74d Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:53:27 +0200 Subject: [PATCH 07/22] Update flux-image-policy.yaml --- charts/application/templates/flux-image-policy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-policy.yaml b/charts/application/templates/flux-image-policy.yaml index 3fae140..51c059a 100644 --- 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")) )) and not .Values.image.tag }} +{{- if (and .Values.image.tagUpdateInterval (or .Values.image.tagSemverRange (has .Values.image.tagNumerical (list "asc" "desc")) (has .Values.image.tagAlphabetical (list "asc" "desc")) )) and not .Values.image.hash }} {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }} apiVersion: image.toolkit.fluxcd.io/v1beta2 {{- else }} From f7408cf0765d607b4fa6567a83a5ee316c51da29 Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:59:34 +0200 Subject: [PATCH 08/22] Update values.yaml --- charts/application/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/application/values.yaml b/charts/application/values.yaml index 854b5cf..9128d10 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -58,7 +58,6 @@ image: tag: 1.12.21 # When hash is set image.tag, imagepolicy and imagerepository is ignored hash: "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" - pullPolicy: IfNotPresent # ImagePolicy options: From 04225485749cfab5b222890754f16210f452edca Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:40:56 +0200 Subject: [PATCH 09/22] Update flux-image-repository.yaml --- charts/application/templates/flux-image-repository.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-repository.yaml b/charts/application/templates/flux-image-repository.yaml index e150b97..4cd2b44 100644 --- 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 )) and not .Values.image.hash }} +{{- if and .Values.image.tagUpdateInterval (or .Values.image.tagSemverRange .Values.image.tagNumerical .Values.image.tagAlphabetical ) (not .Values.image.hash) }} {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }} apiVersion: image.toolkit.fluxcd.io/v1beta2 {{- else }} From 6ad8566c66792836acc9f85015c1b2079a11393c Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:42:49 +0200 Subject: [PATCH 10/22] Update flux-image-policy.yaml --- charts/application/templates/flux-image-policy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-policy.yaml b/charts/application/templates/flux-image-policy.yaml index 51c059a..796264a 100644 --- 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")) )) and not .Values.image.hash }} +{{- 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.hash ) }} {{- if .Capabilities.APIVersions.Has "image.toolkit.fluxcd.io/v1beta2" }} apiVersion: image.toolkit.fluxcd.io/v1beta2 {{- else }} From e69b905fa1fcdfaadd2cac89ffdce542475b243f Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:50:06 +0200 Subject: [PATCH 11/22] Update values.yaml --- charts/application/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/application/values.yaml b/charts/application/values.yaml index 9128d10..68989ea 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -57,7 +57,8 @@ image: repository: quay.io/heubeck/examiner tag: 1.12.21 # When hash is set image.tag, imagepolicy and imagerepository is ignored - hash: "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" + # e.g. "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" + hash: pullPolicy: IfNotPresent # ImagePolicy options: From 90fe0a61949fc7bea74fd51b32306d097918be40 Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:38:11 +0200 Subject: [PATCH 12/22] Update values.yaml --- charts/application/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/values.yaml b/charts/application/values.yaml index 68989ea..793668f 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -58,7 +58,7 @@ image: tag: 1.12.21 # When hash is set image.tag, imagepolicy and imagerepository is ignored # e.g. "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" - hash: + hash: pullPolicy: IfNotPresent # ImagePolicy options: From fd4f8900dbc6ae776530e59491cd071bb626602f Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:52:17 +0200 Subject: [PATCH 13/22] Update charts/application/templates/_podTemplate.tpl Co-authored-by: Tung Beier <44575474+beiertu-mms@users.noreply.github.com> --- charts/application/templates/_podTemplate.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl index bca8aa0..5164919 100644 --- a/charts/application/templates/_podTemplate.tpl +++ b/charts/application/templates/_podTemplate.tpl @@ -51,10 +51,10 @@ spec: initContainers: {{ if not .Values.initContainers -}}[]{{- end -}} {{- range $i := .Values.initContainers }} - name: {{ $i.name }} - {{- if .image.tag }} - image: "{{ .image.repository }}:{{ .image.tag }}" - {{- else }} + {{- if .image.hash }} image: "{{ .image.repository }}@{{ .image.hash }}" + {{- else }} + image: "{{ .image.repository }}:{{ .image.tag }}" {{- end }} imagePullPolicy: {{ or $i.image.pullPolicy $.Values.initDefaults.image.pullPolicy }} command: {{ if not $i.command }}[]{{ end }} From 717fbaf1689a5dc4cb288cd18febd49254ce1b8c Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:52:26 +0200 Subject: [PATCH 14/22] Update charts/application/values.yaml Co-authored-by: Tung Beier <44575474+beiertu-mms@users.noreply.github.com> --- charts/application/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/values.yaml b/charts/application/values.yaml index 793668f..ab6c3d1 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -58,7 +58,7 @@ image: tag: 1.12.21 # When hash is set image.tag, imagepolicy and imagerepository is ignored # e.g. "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" - hash: + digest: pullPolicy: IfNotPresent # ImagePolicy options: From 03159d3ee0568708a352616e43e7dd779cc0a1cd Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:53:36 +0200 Subject: [PATCH 15/22] Update README.md --- charts/application/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/README.md b/charts/application/README.md index 533ac24..df1474c 100644 --- a/charts/application/README.md +++ b/charts/application/README.md @@ -40,7 +40,7 @@ Generic application chart with common requirements of a typical workload. | readinessProbe.timeoutSeconds | int | `5` | | | image.repository | string | `"quay.io/heubeck/examiner"` | | | image.tag | string | `"1.12.21"` | | -| image.hash | string | `"sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f"` | | +| image.digest | string | `nil` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.tagSemverRange | string | `nil` | | | image.tagNumerical | string | `nil` | | From 31c6b7e3bc38b2da3ffec552323b9d54cc15bbdd Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:55:08 +0200 Subject: [PATCH 16/22] Update _podTemplate.tpl --- charts/application/templates/_podTemplate.tpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl index 5164919..ce9cd37 100644 --- a/charts/application/templates/_podTemplate.tpl +++ b/charts/application/templates/_podTemplate.tpl @@ -51,8 +51,8 @@ spec: initContainers: {{ if not .Values.initContainers -}}[]{{- end -}} {{- range $i := .Values.initContainers }} - name: {{ $i.name }} - {{- if .image.hash }} - image: "{{ .image.repository }}@{{ .image.hash }}" + {{- if .image.digest }} + image: "{{ .image.repository }}@{{ .image.digest }}" {{- else }} image: "{{ .image.repository }}:{{ .image.tag }}" {{- end }} @@ -111,10 +111,10 @@ spec: containers: {{- range $s := .Values.sidecars }} - name: {{ $s.name }} - {{- if .image.tag }} - image: "{{ .image.repository }}:{{ .image.tag }}" + {{- if .image.digest }} + image: "{{ .image.repository }}@{{ .image.digest }}" {{- else }} - image: "{{ .image.repository }}@{{ .image.hash }}" + image: "{{ .image.repository }}:{{ .image.tag }}" {{- end }} imagePullPolicy: {{ or $s.image.pullPolicy $.Values.sidecarDefaults.image.pullPolicy }} args: {{ if not $s.args }}[]{{ end }} @@ -203,10 +203,10 @@ spec: securityContext: {{- toYaml .Values.container.securityContext | nindent 8 }} {{- end }} - {{- if .Values.image.tag }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + {{- if .Values.image.digest }} + image: "{{ .Values.image.repository }}@{{ .Values.image.digest }}" {{- else }} - image: "{{ .Values.image.repository }}@{{ .Values.image.hash }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: {{ if not .Values.container.args }}[]{{ end }} From 00f555967a0bcc4995798185fce94e5bea29dd4e Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:55:27 +0200 Subject: [PATCH 17/22] Update flux-image-policy.yaml --- charts/application/templates/flux-image-policy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-policy.yaml b/charts/application/templates/flux-image-policy.yaml index 796264a..1268cfe 100644 --- 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")) ) (not .Values.image.hash ) }} +{{- 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 }} From ee7577f2125d824fcee12ac517d74f2ed5226ce0 Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:55:36 +0200 Subject: [PATCH 18/22] Update flux-image-repository.yaml --- charts/application/templates/flux-image-repository.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/templates/flux-image-repository.yaml b/charts/application/templates/flux-image-repository.yaml index 4cd2b44..cba1e3e 100644 --- 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 ) (not .Values.image.hash) }} +{{- 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 }} From 3233dfd4bd70eae5360cc9090a24bc726546d8ad Mon Sep 17 00:00:00 2001 From: Florian Heubeck <40993644+heubeck@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:16:46 +0200 Subject: [PATCH 19/22] Update charts/application/values.yaml Co-authored-by: Tung Beier <44575474+beiertu-mms@users.noreply.github.com> --- charts/application/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/values.yaml b/charts/application/values.yaml index ab6c3d1..bc6caf8 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -56,7 +56,7 @@ readinessProbe: image: repository: quay.io/heubeck/examiner tag: 1.12.21 - # When hash is set image.tag, imagepolicy and imagerepository is ignored + # When image.digest is set the image.tag, imagepolicy and imagerepository is ignored # e.g. "sha256:b187aed68cc8c75f475efe8aebcc61fc7ca0c5adc2d2c5b8318997c3edc8d32f" digest: pullPolicy: IfNotPresent From 87e369f8585d211d23deaf4e583c963136bb17fa Mon Sep 17 00:00:00 2001 From: mhaxp <87659838+mhaxp@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:44:31 +0200 Subject: [PATCH 20/22] Update Chart.yaml --- charts/application/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml index 8ca6411..9a3d83a 100644 --- 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.20.2 From 6751f6b03a1d7b3bdbfc92e599071675e0a4270d Mon Sep 17 00:00:00 2001 From: Florian Heubeck <40993644+heubeck@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:13:01 +0200 Subject: [PATCH 21/22] Increment application chat version --- charts/application/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml index 9a3d83a..5e53d6d 100644 --- 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.2 +version: 1.21.0 From 41fe65f8f92a09d2df351f2917387d2bc5868c2b Mon Sep 17 00:00:00 2001 From: Florian Heubeck Date: Mon, 22 Jul 2024 17:17:08 +0200 Subject: [PATCH 22/22] [Application] Add image digit test and increment sample app version --- chart-tests/application/ci/test-image-sha-values.yaml | 11 +++++++++++ .../ci/test-resources-and-label-values.yaml | 2 +- chart-tests/application/ci/test-sidecar-values.yaml | 4 ++-- .../ci/test-statefulset-sidecar-values.yaml | 4 ++-- charts/application/README.md | 2 +- charts/application/values.yaml | 4 ++-- 6 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 chart-tests/application/ci/test-image-sha-values.yaml diff --git a/chart-tests/application/ci/test-image-sha-values.yaml b/chart-tests/application/ci/test-image-sha-values.yaml new file mode 100644 index 0000000..94f11ff --- /dev/null +++ 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 index dde192b..13731ca 100644 --- 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 index f955092..84c85e0 100644 --- 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 index 01bb0b7..e980e4c 100644 --- 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/README.md b/charts/application/README.md index df1474c..345a116 100644 --- a/charts/application/README.md +++ b/charts/application/README.md @@ -39,7 +39,7 @@ 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` | | diff --git a/charts/application/values.yaml b/charts/application/values.yaml index bc6caf8..71e5073 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -55,7 +55,7 @@ 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: @@ -306,7 +306,7 @@ sidecars: [] # - name: sqlproxy # image: # repository: quay.io/heubeck/examiner -# tag: 1.12.21 +# tag: 1.13.1 # args: [] # env: {} # configEnvFrom: []