DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases 1 Wiki Activity

fix(common): always force a rename and recreate of cert-secrets on update (#1422)

Browse Source 
* fix(common): always force a rename and recreate of cert-secrets on update

* hmm

* adapt tests
This commit is contained in:
Kjeld Schouten-Lebbing
2021-11-30 00:49:16 +01:00
committed by GitHub
parent 70df160dd3
commit daee087f81
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -15,4 +15,4 @@ maintainers:
name: common name: common
sources: null sources: null
type: library type: library
version: 8.9.4 version: 8.9.5
charts/library/common/templates/classes/_ingress.tpl
+1 -1
View File
@@ -85,7 +85,7 @@ spec:
- {{ tpl . $ | quote }} - {{ tpl . $ | quote }}
{{- end }} {{- end }}
{{- if $tlsValues.scaleCert }} {{- if $tlsValues.scaleCert }}
secretName: {{ ( printf "%v-%v-%v-%v-%v" $ingressName "tls" $index "ixcert" $tlsValues.scaleCert ) }} secretName: {{ ( printf "%v-%v-%v-%v-%v-%v" $ingressName "tls" $index "ixcert" $tlsValues.scaleCert $.Release.Revision ) }}
{{- else if .secretName }} {{- else if .secretName }}
secretName: {{ tpl .secretName $ | quote}} secretName: {{ tpl .secretName $ | quote}}
{{- end }} {{- end }}
charts/library/common/templates/lib/cert/_certSecret.tpl
+1 -1
View File
@@ -20,7 +20,7 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ $secretName }} name: {{ $secretName }}-{{ .Release.Revision }}
labels: {{ include "common.labels" . | nindent 4 }} labels: {{ include "common.labels" . | nindent 4 }}
type: kubernetes.io/tls type: kubernetes.io/tls
data: data:
tests/library/common/cert_spec.rb
+7 -7
View File
@@ -88,7 +88,7 @@ class Test < ChartTest
chart.value values chart.value values
refute_nil(resource('Secret')) refute_nil(resource('Secret'))
secret = chart.resources(kind: "Secret").first secret = chart.resources(kind: "Secret").first
assert_equal("common-test-tls-0-ixcert-1", secret["metadata"]["name"]) assert_equal("common-test-tls-0-ixcert-1-1", secret["metadata"]["name"])
refute_nil(secret["data"]["tls.crt"]) refute_nil(secret["data"]["tls.crt"])
refute_nil(secret["data"]["tls.key"]) refute_nil(secret["data"]["tls.key"])
end end
@@ -166,13 +166,13 @@ class Test < ChartTest
chart.value values chart.value values
refute_nil(resource('Secret')) refute_nil(resource('Secret'))
secret = chart.resources(kind: "Secret").first secret = chart.resources(kind: "Secret").first
assert_equal("common-test-tls-0-ixcert-1", secret["metadata"]["name"]) assert_equal("common-test-tls-0-ixcert-1-1", secret["metadata"]["name"])
refute_nil(secret["data"]["tls.crt"]) refute_nil(secret["data"]["tls.crt"])
refute_nil(secret["data"]["tls.key"]) refute_nil(secret["data"]["tls.key"])
ingress = chart.resources(kind: "Ingress").find{ |s| s["metadata"]["name"] == "common-test" } ingress = chart.resources(kind: "Ingress").find{ |s| s["metadata"]["name"] == "common-test" }
refute_nil(ingress) refute_nil(ingress)
assert_equal("common-test-tls-0-ixcert-1", ingress["spec"]["tls"][0]["secretName"]) assert_equal("common-test-tls-0-ixcert-1-1", ingress["spec"]["tls"][0]["secretName"])
end end
it 'multiple tls sections generate multiple secrets' do it 'multiple tls sections generate multiple secrets' do
values = { values = {
@@ -304,18 +304,18 @@ class Test < ChartTest
chart.value values chart.value values
refute_nil(resource('Secret')) refute_nil(resource('Secret'))
secret1 = chart.resources(kind: "Secret").first secret1 = chart.resources(kind: "Secret").first
assert_equal("common-test-tls-0-ixcert-1", secret1["metadata"]["name"]) assert_equal("common-test-tls-0-ixcert-1-1", secret1["metadata"]["name"])
refute_nil(secret1["data"]["tls.crt"]) refute_nil(secret1["data"]["tls.crt"])
refute_nil(secret1["data"]["tls.key"]) refute_nil(secret1["data"]["tls.key"])
secret2 = chart.resources(kind: "Secret").find{ |s| s["metadata"]["name"] == "common-test-tls-1-ixcert-2" } secret2 = chart.resources(kind: "Secret").find{ |s| s["metadata"]["name"] == "common-test-tls-1-ixcert-2-1" }
refute_nil(secret2) refute_nil(secret2)
refute_nil(secret2["data"]["tls.crt"]) refute_nil(secret2["data"]["tls.crt"])
refute_nil(secret2["data"]["tls.key"]) refute_nil(secret2["data"]["tls.key"])
ingress = chart.resources(kind: "Ingress").find{ |s| s["metadata"]["name"] == "common-test" } ingress = chart.resources(kind: "Ingress").find{ |s| s["metadata"]["name"] == "common-test" }
refute_nil(ingress) refute_nil(ingress)
assert_equal("common-test-tls-0-ixcert-1", ingress["spec"]["tls"][0]["secretName"]) assert_equal("common-test-tls-0-ixcert-1-1", ingress["spec"]["tls"][0]["secretName"])
assert_equal("common-test-tls-1-ixcert-2", ingress["spec"]["tls"][1]["secretName"]) assert_equal("common-test-tls-1-ixcert-2-1", ingress["spec"]["tls"][1]["secretName"])
end end
end end
end end