From 4c4072119c79b79992699f84d9956ccff9363e49 Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 1 Aug 2022 23:40:35 -0400 Subject: [PATCH 1/8] Add fullnameOverride based on infra def and service name --- helm-chart/values-name-Spring Forward.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 helm-chart/values-name-Spring Forward.yaml diff --git a/helm-chart/values-name-Spring Forward.yaml b/helm-chart/values-name-Spring Forward.yaml new file mode 100644 index 0000000..f16344b --- /dev/null +++ b/helm-chart/values-name-Spring Forward.yaml @@ -0,0 +1 @@ +fullnameOverride: "release-spring-forward" From d6cfc7ba3008b2bb4ed87544154d471b2d3d407e Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 1 Aug 2022 23:49:52 -0400 Subject: [PATCH 2/8] Correct filename for rename valuess --- ...Spring Forward.yaml => values-name-rename-Spring Forward.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename helm-chart/{values-name-Spring Forward.yaml => values-name-rename-Spring Forward.yaml} (100%) diff --git a/helm-chart/values-name-Spring Forward.yaml b/helm-chart/values-name-rename-Spring Forward.yaml similarity index 100% rename from helm-chart/values-name-Spring Forward.yaml rename to helm-chart/values-name-rename-Spring Forward.yaml From cfdc973a388f9f3ccbb20ef62e74e5a3e0274e2d Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Mon, 1 Aug 2022 23:57:45 -0400 Subject: [PATCH 3/8] Fix release name --- helm-chart/values-name-rename-Spring Forward.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/values-name-rename-Spring Forward.yaml b/helm-chart/values-name-rename-Spring Forward.yaml index f16344b..53ab006 100644 --- a/helm-chart/values-name-rename-Spring Forward.yaml +++ b/helm-chart/values-name-rename-Spring Forward.yaml @@ -1 +1 @@ -fullnameOverride: "release-spring-forward" +fullnameOverride: "release-rename-spring-forward" From 8cce38aee45e00c72741e175a0e51d077544c856 Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Tue, 2 Aug 2022 13:40:09 -0400 Subject: [PATCH 4/8] Add nameOverride --- helm-chart/values-name-rename-Spring Forward.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm-chart/values-name-rename-Spring Forward.yaml b/helm-chart/values-name-rename-Spring Forward.yaml index 53ab006..c4f09ad 100644 --- a/helm-chart/values-name-rename-Spring Forward.yaml +++ b/helm-chart/values-name-rename-Spring Forward.yaml @@ -1 +1,2 @@ +nameOverride: "release-rename" fullnameOverride: "release-rename-spring-forward" From 2c6546d44dd696481d53b96d1d9a663bfc6071eb Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Tue, 2 Aug 2022 14:04:58 -0400 Subject: [PATCH 5/8] Switch to use nameOverride on instance label --- helm-chart/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/templates/_helpers.tpl b/helm-chart/templates/_helpers.tpl index 42e1c48..82dc4f8 100644 --- a/helm-chart/templates/_helpers.tpl +++ b/helm-chart/templates/_helpers.tpl @@ -47,7 +47,7 @@ Selector labels */}} {{- define "spring-forward.selectorLabels" -}} app.kubernetes.io/name: {{ include "spring-forward.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/instance: {{ include "spring-forward.name" . }} {{- end }} {{/* From 29f7546792990631ea6715b4263a0afe98418937 Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Tue, 2 Aug 2022 17:09:37 -0400 Subject: [PATCH 6/8] Add instancenameOverride --- helm-chart/templates/_helpers.tpl | 2 +- helm-chart/values-name-rename-Spring Forward.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/helm-chart/templates/_helpers.tpl b/helm-chart/templates/_helpers.tpl index 82dc4f8..ed00283 100644 --- a/helm-chart/templates/_helpers.tpl +++ b/helm-chart/templates/_helpers.tpl @@ -47,7 +47,7 @@ Selector labels */}} {{- define "spring-forward.selectorLabels" -}} app.kubernetes.io/name: {{ include "spring-forward.name" . }} -app.kubernetes.io/instance: {{ include "spring-forward.name" . }} +app.kubernetes.io/instance: {{ .Values.instancenameOverride }} {{- end }} {{/* diff --git a/helm-chart/values-name-rename-Spring Forward.yaml b/helm-chart/values-name-rename-Spring Forward.yaml index c4f09ad..48f5a24 100644 --- a/helm-chart/values-name-rename-Spring Forward.yaml +++ b/helm-chart/values-name-rename-Spring Forward.yaml @@ -1,2 +1,3 @@ -nameOverride: "release-rename" +instancenameOverride: "release-rename" +nameOverride: "spring-forward" fullnameOverride: "release-rename-spring-forward" From bbbcae3749c1e2a968dfe4611a450b13ee08d44c Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Thu, 4 Aug 2022 10:42:34 -0400 Subject: [PATCH 7/8] Add range example --- helm-chart/templates/test.yaml | 4 ++++ helm-chart/values.yaml | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 helm-chart/templates/test.yaml diff --git a/helm-chart/templates/test.yaml b/helm-chart/templates/test.yaml new file mode 100644 index 0000000..0b1d285 --- /dev/null +++ b/helm-chart/templates/test.yaml @@ -0,0 +1,4 @@ +test: + {{- range $key, $secret := .Values.tplsecret }} + {{- printf "%s: %s" $key $secret | nindent 2 }} + {{- end }} diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index f70021b..8d13d7e 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -2,6 +2,11 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +tplsecret: + test1: value + test2: value +#tplsecret: "test: test" + replicaCount: 1 image: From 37dea87e1070cb1a4ec74eaf0dd2b45d3012e8ad Mon Sep 17 00:00:00 2001 From: Chris Suran Date: Thu, 4 Aug 2022 10:47:42 -0400 Subject: [PATCH 8/8] Fix names --- helm-chart/templates/test.yaml | 2 +- helm-chart/values.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/helm-chart/templates/test.yaml b/helm-chart/templates/test.yaml index 0b1d285..e15e973 100644 --- a/helm-chart/templates/test.yaml +++ b/helm-chart/templates/test.yaml @@ -1,4 +1,4 @@ test: - {{- range $key, $secret := .Values.tplsecret }} + {{- range $key, $secret := .Values.secret }} {{- printf "%s: %s" $key $secret | nindent 2 }} {{- end }} diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 8d13d7e..b77cef7 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -2,10 +2,9 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -tplsecret: +secret: test1: value test2: value -#tplsecret: "test: test" replicaCount: 1