From 7ddf11f18e2a0844c2bd22fcd3da0df60a8e5058 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 1 Jul 2021 12:31:36 +0200
Subject: [PATCH] Fix scaleCert naming inconsistencies on common

---
 charts/library/common/Chart.yaml                         | 2 +-
 charts/library/common/templates/_ingress.tpl             | 7 +++++--
 charts/library/common/templates/lib/cert/_certSecret.tpl | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index a6bf1a59f14..4b4ae9cc6cf 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.4.5
+version: 6.4.6
diff --git a/charts/library/common/templates/_ingress.tpl b/charts/library/common/templates/_ingress.tpl
index acf36bf3516..843c370a244 100644
--- a/charts/library/common/templates/_ingress.tpl
+++ b/charts/library/common/templates/_ingress.tpl
@@ -13,9 +13,12 @@
       {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}}
       {{- include "common.classes.ingress" $ }}
 
-      {{- range $name, $tlsValues :=  $ingressValues.tls }}
+      {{- range $index, $tlsValues :=  $ingressValues.tls }}
         {{- 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 $ "ObjectValues" (dict "certHolder" $tlsValues) -}}
           {{- include "common.cert.secret" $ }}
diff --git a/charts/library/common/templates/lib/cert/_certSecret.tpl b/charts/library/common/templates/lib/cert/_certSecret.tpl
index 59096f739e9..07e2e42cb90 100644
--- a/charts/library/common/templates/lib/cert/_certSecret.tpl
+++ b/charts/library/common/templates/lib/cert/_certSecret.tpl
@@ -3,8 +3,8 @@
 {{- $secretName := include "common.names.fullname" . -}}
 
 {{- if .ObjectValues.certHolder -}}
-  {{- if hasKey .ObjectValues.certHolder "nameSuffix" -}}
-    {{- $secretName = ( printf "%v-%v-%v-%v" $secretName .ObjectValues.certHolder.nameSuffix "ixcert" .ObjectValues.certHolder.scaleCert ) -}}
+  {{- if hasKey .ObjectValues.certHolder "nameOverride" -}}
+    {{- $secretName = ( printf "%v-%v-%v-%v" $secretName .ObjectValues.certHolder.nameOverride "ixcert" .ObjectValues.certHolder.scaleCert ) -}}
   {{- else }}
     {{- $secretName = ( printf "%v-%v-%v" $secretName "ixcert" .ObjectValues.certHolder.scaleCert ) -}}
   {{ end -}}