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

Fix scaleCert naming inconsistencies on common

Browse Source
This commit is contained in:
kjeld Schouten-Lebbing
2021-07-01 12:31:36 +02:00
parent cc566b6ae3
commit 7ddf11f18e
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/library/common/Chart.yaml
+1 -1
View File
@@ -18,4 +18,4 @@ maintainers:
name: common name: common
sources: sources:
type: library type: library
version: 6.4.5 version: 6.4.6
charts/library/common/templates/_ingress.tpl
+5 -2
View File
@@ -13,9 +13,12 @@
{{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}} {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}}
{{- include "common.classes.ingress" $ }} {{- include "common.classes.ingress" $ }}
{{- range $name, $tlsValues := $ingressValues.tls }} {{- range $index, $tlsValues := $ingressValues.tls }}
{{- if .scaleCert }} {{- if .scaleCert }}
{{- $nameOverride := ( printf "%v-%v-%v" $ingressValues.nameOverride "tls" $name ) -}} {{- $nameOverride := ( printf "%v-%v" "tls" $index ) -}}
{{- if $ingressValues.nameOverride -}}
{{- $nameOverride = ( printf "%v-%v-%v" $ingressValues.nameOverride "tls" $index ) -}}
{{- end }}
{{- $_ := set $tlsValues "nameOverride" $nameOverride -}} {{- $_ := set $tlsValues "nameOverride" $nameOverride -}}
{{- $_ := set $ "ObjectValues" (dict "certHolder" $tlsValues) -}} {{- $_ := set $ "ObjectValues" (dict "certHolder" $tlsValues) -}}
{{- include "common.cert.secret" $ }} {{- include "common.cert.secret" $ }}
charts/library/common/templates/lib/cert/_certSecret.tpl
+2 -2
View File
@@ -3,8 +3,8 @@
{{- $secretName := include "common.names.fullname" . -}} {{- $secretName := include "common.names.fullname" . -}}
{{- if .ObjectValues.certHolder -}} {{- if .ObjectValues.certHolder -}}
{{- if hasKey .ObjectValues.certHolder "nameSuffix" -}} {{- if hasKey .ObjectValues.certHolder "nameOverride" -}}
{{- $secretName = ( printf "%v-%v-%v-%v" $secretName .ObjectValues.certHolder.nameSuffix "ixcert" .ObjectValues.certHolder.scaleCert ) -}} {{- $secretName = ( printf "%v-%v-%v-%v" $secretName .ObjectValues.certHolder.nameOverride "ixcert" .ObjectValues.certHolder.scaleCert ) -}}
{{- else }} {{- else }}
{{- $secretName = ( printf "%v-%v-%v" $secretName "ixcert" .ObjectValues.certHolder.scaleCert ) -}} {{- $secretName = ( printf "%v-%v-%v" $secretName "ixcert" .ObjectValues.certHolder.scaleCert ) -}}
{{ end -}} {{ end -}}