working version

Signed-off-by: Jeromy Cannon <[email protected]>
hashgraph · Jan 22, 2024 · aa51a3a · aa51a3a
1 parent e14300f
commit aa51a3a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml
@@ -1,7 +1,7 @@
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: {{ .Values.issuers.production.name }}
+  name: {{ tpl .Values.issuers.production.name $ }}
   namespace: cert-manager
   {{- with .Values.issuers.annotations }}
   annotations:
@@ -12,15 +12,22 @@ spec:
     server: https://acme-v02.api.letsencrypt.org/directory
     email: {{ .Values.issuers.production.email }}
     privateKeySecretRef:
-      name: {{ .Values.issuers.production.name }}
+      name: {{ tpl .Values.issuers.production.name $ }}
     solvers:
       {{- if .Values.solvers.http01.enabled }}
       - http01:
           {{- if .Values.solvers.http01.solverType | eq "ingress" }}
           ingress:
             {{- with .Values.solvers.http01.ingress }}
-            name: {{ tpl .name $ }}
-            class: {{ $.Values.global.ingressClassName | default .class }}
+            {{- with .name }}
+            name: {{ . }}
+            {{- end }}
+            {{- with .class }}
+            class: {{ . }}
+            {{- end }}
+            {{- with $.Values.global.ingressClassName }}
+            ingressClassName: {{ . }}
+            {{- end }}
             serviceType: {{ .serviceType }}
             {{- end }}
           {{- end }}

diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml
@@ -1,7 +1,7 @@
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: {{ .Values.issuers.staging.name }}
+  name: {{ tpl .Values.issuers.staging.name $ }}
   namespace: cert-manager
   {{- with .Values.issuers.annotations }}
   annotations:
@@ -12,15 +12,22 @@ spec:
     server: https://acme-staging-v02.api.letsencrypt.org/directory
     email: {{ .Values.issuers.staging.email }}
     privateKeySecretRef:
-      name: {{ .Values.issuers.staging.name }}
+      name: {{ tpl .Values.issuers.staging.name $ }}
     solvers:
       {{- if .Values.solvers.http01.enabled }}
       - http01:
           {{- if .Values.solvers.http01.solverType | eq "ingress" }}
           ingress:
             {{- with .Values.solvers.http01.ingress }}
-            name: {{ tpl .name $ }}
-            class: {{ $.Values.global.ingressClassName | default .class }}
+            {{- with .name }}
+            name: {{ . }}
+            {{- end }}
+            {{- with .class }}
+            class: {{ . }}
+            {{- end }}
+            {{- with $.Values.global.ingressClassName }}
+            ingressClassName: {{ . }}
+            {{- end }}
             serviceType: {{ .serviceType }}
             {{- end }}
           {{- end }}

diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml
@@ -1,4 +1,5 @@
 global:
+  namespaceOverride: ""
   ingressClassName: "" # if set, takes precedence over the solvers.http01.ingress.class
 
 issuers:
@@ -17,6 +18,7 @@ solvers:
     ingress:
       name: ""
       class: ""
+      ingressClassName: ""
       serviceType: "NodePort"
     gatewayHTTPRoute:
       name: ""

diff --git a/charts/fullstack-deployment/values.yaml b/charts/fullstack-deployment/values.yaml
@@ -54,6 +54,8 @@ acme-cluster-issuer:
   solvers: # TODO change in: https://github.com/hashgraph/full-stack-testing/issues/631
     http01:
       solverType: "ingress"
+      ingress:
+        ingressClassName: '{{ .Values.global.ingressClassName }}'
 
 # default settings for a single node
 # This default configurations can be overridden for each node in the hedera.nodes section.