From 2ae549c693af07288924cc2e3d3640459ece786a Mon Sep 17 00:00:00 2001
From: Jeromy Cannon <jeromy@swirldslabs.com>
Date: Tue, 23 Jan 2024 14:09:36 +0000
Subject: [PATCH] sync to full-stack-testing changes

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
---
 chart/templates/ingress.yaml | 6 +++---
 chart/values.yaml            | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 973c797d4..72988f188 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -13,8 +13,8 @@ metadata:
   name: {{ $fullName }}
   namespace: {{ include "hedera-explorer.namespace" . }}
 spec:
-  {{- with .Values.ingress.className }}
-  ingressClassName: {{ . }}
+  {{- if or $.Values.global.ingressClassName .Values.ingress.className }}
+  ingressClassName: {{ $.Values.global.ingressClassName | default .Values.ingress.className }}
   {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
@@ -36,7 +36,7 @@ spec:
     {{- range . }}
     - hosts:
         {{- range .hosts }}
-        - {{ . | quote }}
+        - {{ tpl . $ | quote }}
         {{- end }}
       secretName: {{ .secretName }}
     {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 03302002d..b23db882a 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -41,6 +41,7 @@ fullnameOverride: ""
 
 global:
   namespaceOverride: ""
+  ingressClassName: "" # if set, takes precedence over the .Values.ingress.className
 
 image:
   pullPolicy: IfNotPresent