sync to full-stack-testing changes

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
hashgraph · Jan 23, 2024 · 2ae549c · 2ae549c
1 parent c597486
commit 2ae549c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -41,6 +41,7 @@ fullnameOverride: ""
 
 global:
   namespaceOverride: ""
+  ingressClassName: "" # if set, takes precedence over the .Values.ingress.className
 
 image:
   pullPolicy: IfNotPresent
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ fullnameOverride: "" @@
     global:
       namespaceOverride: ""
+      ingressClassName: "" # if set, takes precedence over the .Values.ingress.className
     image:
       pullPolicy: IfNotPresent
@@ Expand Down @@