From f81422c66518e086f826ff56a0039213ff295ebe Mon Sep 17 00:00:00 2001 From: Chris Berg Date: Mon, 27 Nov 2023 11:23:15 -0800 Subject: [PATCH 1/4] fix: added timestamp to default label generation --- charts/component/Chart.yaml | 2 +- charts/component/templates/_helpers.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/component/Chart.yaml b/charts/component/Chart.yaml index a33acc4..3aa119e 100644 --- a/charts/component/Chart.yaml +++ b/charts/component/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.2.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/component/templates/_helpers.tpl b/charts/component/templates/_helpers.tpl index cc8a372..e6ef3b7 100644 --- a/charts/component/templates/_helpers.tpl +++ b/charts/component/templates/_helpers.tpl @@ -39,8 +39,8 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/image-tag: {{ .Values.image.tag | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/timestamp: {{ now }} {{- end }} - {{/* Selector labels */}} From 4bf66ecffa7cb3ef38fdb02843c8a9d667a948f7 Mon Sep 17 00:00:00 2001 From: Chris Berg Date: Mon, 27 Nov 2023 12:01:58 -0800 Subject: [PATCH 2/4] fix: added timestamp to default label generation --- charts/component/templates/_helpers.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/component/templates/_helpers.tpl b/charts/component/templates/_helpers.tpl index e6ef3b7..9bfb7dd 100644 --- a/charts/component/templates/_helpers.tpl +++ b/charts/component/templates/_helpers.tpl @@ -38,8 +38,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- if and .Values.image .Values.image.tag }} app.kubernetes.io/image-tag: {{ .Values.image.tag | quote }} {{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/timestamp: {{ now }} +{{- if .Values.global.labels }} +{{tpl .Values.global.labels .}} +{{- end }} {{- end }} {{/* Selector labels From 2a229feb2f7b47b8de01a84e7256cb9ebd0a48fa Mon Sep 17 00:00:00 2001 From: Chris Berg Date: Mon, 27 Nov 2023 14:38:07 -0800 Subject: [PATCH 3/4] fix: Added templating logic for podAnnotations --- charts/component/templates/_helpers.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/component/templates/_helpers.tpl b/charts/component/templates/_helpers.tpl index 9bfb7dd..42d1154 100644 --- a/charts/component/templates/_helpers.tpl +++ b/charts/component/templates/_helpers.tpl @@ -54,6 +54,9 @@ app.kubernetes.io/instance: {{ .Release.Name }} Pod Annotations */}} {{- define "component.podAnnotations" -}} +{{- if .Values.global.podAnnotations }} +{{tpl .Values.global.podAnnotations .}} +{{- end }} {{- end }} From 26a98ffe3cc79af4b6b16f15c0ef70941c78cc0f Mon Sep 17 00:00:00 2001 From: Chris Berg Date: Mon, 27 Nov 2023 14:38:44 -0800 Subject: [PATCH 4/4] bump chart verison --- charts/component/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/component/Chart.yaml b/charts/component/Chart.yaml index 3aa119e..f665337 100644 --- a/charts/component/Chart.yaml +++ b/charts/component/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.1 +version: 0.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to