Squashed commit of the following:

commit 9446ce7 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Wed Jan 24 21:16:43 2024 +0000 added test Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit d12877c Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Wed Jan 24 19:58:14 2024 +0000 working version Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 0933869 Merge: e9555a2 1772906 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 25 08:05:01 2024 +1100 Merge branch 'main' into 605-kubernetes-javascript-client commit e9555a2 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 25 08:00:20 2024 +1100 fix: allow namespace to be created during chart install Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 1772906 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Wed Jan 24 17:25:22 2024 +0000 chore: switch back to acme-cluster-issuer from repo now that changes have be… (#691) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit f1191e4 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Wed Jan 24 16:28:21 2024 +0000 chore: feedback from PR review for hedera-explorer chart changes (#690) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 6956df2 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 19:54:20 2024 +1100 rename test setup script Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 1c8ee25 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 18:30:13 2024 +1100 fix test Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit a911703 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 18:25:46 2024 +1100 fix: rename Kubectl2 to K8 Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit acd277f Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 18:17:34 2024 +1100 fix: relay command Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 5ba143c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 18:16:52 2024 +1100 fix: waitForPod Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 1194025 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 17:54:46 2024 +1100 fix: remove kubectl usage Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 7387dff Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 17:53:36 2024 +1100 fix: add clone method for Kubectl2 Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit af5e7a4 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 14:30:37 2024 +1100 fix: do not poll after copyToPod or copyFromPod Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 5a9b96c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 13:04:01 2024 +1100 fix: make waitForPod non-blocking Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 468b0b0 Merge: 644c0e0 f3b3028 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 24 12:59:53 2024 +1100 Merge branch 'main' into 605-kubernetes-javascript-client Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> # Conflicts: # fullstack-network-manager/package-lock.json # fullstack-network-manager/package.json commit 644c0e0 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Tue Jan 23 16:03:28 2024 +1100 add setup script for e2e test Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 505ab8d Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Tue Jan 23 15:36:18 2024 +1100 fix: check for pod readiness individually to show more info to the user Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 2b3f9a3 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Tue Jan 23 15:02:11 2024 +1100 fix: e2e tests Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit f3b3028 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Tue Jan 23 02:56:21 2024 +0000 feat: use Acme Lets Encrypt cluster issuer for TLS in Hedera Explorer (#677) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit e44e5b2 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Mon Jan 22 13:23:21 2024 +0000 feat: switch from envoy gateway to services/ingress (#672) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 1a5981b Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 16:54:43 2024 +1100 fix: e2e tests and CI pipelline Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 90b0f4d Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 15:54:08 2024 +1100 fix: check for namespace Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 12c94ab Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 15:45:44 2024 +1100 fix node setup Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 214daba Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 15:12:31 2024 +1100 fix: use default namespace for cluster setup Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit b663d57 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 14:56:55 2024 +1100 fix: get pod IP and copy files checks Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit ec8dd5c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 14:56:43 2024 +1100 fix: split platform code copy and extract into separate steps for better tracking Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 6a4226c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 22 11:29:17 2024 +1100 fix: do not require kind and cluster creation functionalities User is expected to bring their own kubernetes cluster Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 75f3c63 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 19 14:51:41 2024 +1100 test: fix tests for missing kubect2 Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 26dc63c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 19 14:49:49 2024 +1100 fix: use Kubect2 for node commands Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 1415260 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Fri Jan 19 12:37:38 2024 +1100 fix: replace old kubectl with kubectl2 in chart command Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit f24f9d3 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Thu Jan 18 13:51:51 2024 +1100 remove unused import Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 82a80f4 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 17 16:20:53 2024 +1100 feat: implement wait for pod and add check for copy methods Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 841bc53 Author: JeffreyDallas <39912573+JeffreyDallas@users.noreply.github.com> Date: Wed Jan 17 10:18:46 2024 -0600 chore: remove unnecessary gralde.properties (#667) Signed-off-by: Jeffrey Tang <jeffrey@swirldslabs.com> commit 02fdaa8 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 17 16:19:05 2024 +1100 fix: remove unnecessary polling from exec call and cache configManager for cli args Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit d51cdfa Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Wed Jan 17 15:54:54 2024 +1100 fix: refactor config manager to contain the config Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 2eddad2 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Tue Jan 16 14:32:46 2024 +1100 feat: implement port forward and polling utility function Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit fc26a01 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Tue Jan 16 09:30:05 2024 +1100 fix: use exec status to exit from polling and code cleanup Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 7e03a6e Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 18:44:52 2024 +1100 remove incorrect docs Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit aad0af9 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 18:41:27 2024 +1100 add timeout arg Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 33913a9 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 18:36:43 2024 +1100 fix: rewrite async function of a promise with polling Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit cade2bc Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 16:10:31 2024 +1100 fix: remove unused args Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit 66a4817 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 16:09:32 2024 +1100 feat: implement hasDir and hasFile Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit f90450c Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 16:00:48 2024 +1100 cleanup Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit df76d00 Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 15:36:45 2024 +1100 feat: implement copy file to container Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit bfd72cf Author: Lenin Mehedy <lenin.mehedy@swirldslabs.com> Date: Mon Jan 15 12:14:22 2024 +1100 feat: implement Kubectl class using kubernetes javascript client Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com> commit c1a7651 Author: swirlds-automation <swirlds-eng-automation@swirlds.com> Date: Fri Jan 12 16:07:22 2024 +0000 chore(release): 0.17.0 [skip ci] ## [0.17.0](v0.16.0...v0.17.0) (2024-01-12) ### Features * version bump ([46d58f2](46d58f2)) ### Bug Fixes * allow using an existing cluster and do not require kind ([#643](#643)) ([6b53618](6b53618)) * make delete cluster ([#656](#656)) ([ba7426f](ba7426f)) commit 46d58f2 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 12 15:37:52 2024 +0000 feat: version bump Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> commit 35d0250 Author: Jeromy Cannon <jeromy@swirldslabs.com> Date: Fri Jan 12 14:50:02 2024 +0000 chore: remove axios and follow-redirect, and upgrade @hashgraph/sdk to 2.40.0 (#661) Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com> Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
hashgraph · Jan 25, 2024 · 809211b · 809211b
1 parent 6b53618
commit 809211b
Show file tree

Hide file tree

Showing 67 changed files with 2,242 additions and 1,634 deletions.
diff --git a/.github/workflows/zxc-fsnetman-tests.yaml b/.github/workflows/zxc-fsnetman-tests.yaml
@@ -127,10 +127,7 @@ jobs:
         run: |
           npm i
           npm link
-          fsnetman init -d ../charts # use the charts directory for all subsequent commands
-          fsnetman cluster create
-          fsnetman cluster setup --cert-manager --cert-manager-crds
-          fsnetman chart install --enable-tls --self-signed --enable-hedera-explorer-tls
+          ./test/e2e/setup-e2e.sh
           npm run test-e2e
 
       - name: Output logs

diff --git a/charts/fullstack-cluster-setup/Chart.lock b/charts/fullstack-cluster-setup/Chart.lock
@@ -8,11 +8,8 @@ dependencies:
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
   version: 0.27.1
-- name: gateway-helm
-  repository: oci://docker.io/envoyproxy
-  version: v0.6.0
 - name: cert-manager
   repository: https://charts.jetstack.io
   version: v1.13.3
-digest: sha256:6be28d5957a90c40e36baff239651c7d0ed730bf08b767694619cbc78e7dd325
-generated: "2024-01-05T21:22:49.794103Z"
+digest: sha256:cd0eb03b231d5936416078dab1c715e1b6c23412a502d49e261db155096f40f7
+generated: "2024-01-12T17:15:10.149274Z"
diff --git a/charts/fullstack-cluster-setup/Chart.yaml b/charts/fullstack-cluster-setup/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fullstack-cluster-setup
-description: A Helm chart to setup shared resources for fullstack-testing
+description: An umbrella Helm chart to setup shared resources for 1+ deployments of the `fullstack-deployment` chart(s)
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.16.0
+version: 0.17.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.16.0"
+appVersion: "0.17.0"
 
 dependencies:
   - name: operator
@@ -41,12 +41,6 @@ dependencies:
     repository: https://grafana.github.io/helm-charts
     condition: cloud.grafanaAgent.enabled
 
-  - name: gateway-helm
-    alias: envoy-gateway
-    version: v0.6.0
-    repository: oci://docker.io/envoyproxy
-    condition: cloud.envoyGateway.enabled
-
   - name: cert-manager
     version: v1.13.3
     repository: https://charts.jetstack.io

diff --git a/charts/fullstack-cluster-setup/templates/gateway-api/fst-gateway.yaml b/charts/fullstack-cluster-setup/templates/gateway-api/fst-gateway.yaml
diff --git a/charts/fullstack-cluster-setup/templates/rbac/pod-monitor-role.yaml b/charts/fullstack-cluster-setup/templates/rbac/pod-monitor-role.yaml
@@ -20,12 +20,3 @@ rules:
       - pods/exec
     verbs:
       - create
-  - apiGroups: [ "gateway.networking.k8s.io" ]
-    resources:
-      - gatewayclasses
-      - gateways
-      - httproutes
-      - tcproutes
-    verbs:
-      - get
-      - list
diff --git a/charts/fullstack-cluster-setup/values.yaml b/charts/fullstack-cluster-setup/values.yaml
@@ -15,11 +15,13 @@ cloud:
     enabled: false
   grafanaAgent:
     enabled: false
-  envoyGateway:
-    enabled: false
   certManager:
     enabled: false
 
 cert-manager:
   namespace: cert-manager
   installCRDs: false
+
+minio-operator:
+  operator:
+    replicaCount: 1
diff --git a/charts/fullstack-deployment/Chart.lock b/charts/fullstack-deployment/Chart.lock
@@ -9,7 +9,10 @@ dependencies:
   repository: https://operator.min.io/
   version: 5.0.7
 - name: acme-cluster-issuer
-  repository: ""
-  version: 0.3.0
-digest: sha256:65f708d654ba6d14c7b193cc833f132f6133cca53850bcd37cf27809246df0f6
-generated: "2024-01-05T21:23:17.852519Z"
+  repository: https://swirldslabs.github.io/swirldslabs-helm-charts
+  version: 0.3.1
+- name: haproxy-ingress
+  repository: https://haproxy-ingress.github.io/charts
+  version: 0.14.5
+digest: sha256:a895d9b9235e22a469f2b274650fa25e2c7fd586eff205bfa473bdfd4cfd0f91
+generated: "2024-01-24T16:36:12.619906Z"
diff --git a/charts/fullstack-deployment/Chart.yaml b/charts/fullstack-deployment/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fullstack-deployment
-description: A Helm chart for the fullstack deployment
+description: An umbrella Helm chart for a chart deployment of `fullstack-deployment`
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,24 +15,27 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.16.0
+version: 0.17.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.16.0"
+appVersion: "0.17.0"
 
 # This is range of versions of Kubernetes server that is supported by this chart.
 # Note we need to use -0 suffix to support GKE version
 # Reference: https://github.com/helm/helm/issues/3810#issuecomment-379877753
 kubeVersion: ">=1.25.0-0"
 
 dependencies:
+  # hedera-mirror-node-explorer (dependent on hedera-mirror-node)
   - name: hedera-explorer
     version: 0.2.0
+    # TODO use repository once source chart has been updated: https://github.com/hashgraph/full-stack-testing/issues/675
     condition: hedera-explorer.enabled
 
+  # hedera-mirror-node
   - name: hedera-mirror
     alias: hedera-mirror-node
     version: 0.86.0
@@ -46,6 +49,11 @@ dependencies:
     condition: cloud.minio.enabled
 
   - name: acme-cluster-issuer
-    version: 0.3.0
-    # TODO: uncomment #repository: https://swirldslabs.github.io/swirldslabs-helm-charts
+    version: 0.3.1
+    repository: https://swirldslabs.github.io/swirldslabs-helm-charts
     condition: cloud.acmeClusterIssuer.enabled
+
+  - name: haproxy-ingress
+    version: 0.14.5
+    repository: https://haproxy-ingress.github.io/charts
+    condition: cloud.haproxyIngressController.enabled
diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/.helmignore b/charts/fullstack-deployment/charts/acme-cluster-issuer/.helmignore
diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/Chart.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/Chart.yaml
diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml
diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml
diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml
diff --git a/charts/fullstack-deployment/charts/hedera-explorer/templates/ingress.yaml b/charts/fullstack-deployment/charts/hedera-explorer/templates/ingress.yaml
@@ -13,7 +13,7 @@ metadata:
   name: {{ $fullName }}
   namespace: {{ include "hedera-explorer.namespace" . }}
 spec:
-  {{- with .Values.ingress.className }}
+  {{- with (coalesce .Values.global.ingressClassName .Values.ingress.className) }}
   ingressClassName: {{ . }}
   {{- end }}
   rules:
@@ -36,7 +36,7 @@ spec:
     {{- range . }}
     - hosts:
         {{- range .hosts }}
-        - {{ . | quote }}
+        - {{ tpl . $ | quote }}
         {{- end }}
       secretName: {{ .secretName }}
     {{- end }}

diff --git a/charts/fullstack-deployment/charts/hedera-explorer/values.yaml b/charts/fullstack-deployment/charts/hedera-explorer/values.yaml
@@ -41,6 +41,7 @@ fullnameOverride: ""
 
 global:
   namespaceOverride: ""
+  ingressClassName: "" # if set, takes precedence over the .Values.ingress.className
 
 image:
   pullPolicy: IfNotPresent

diff --git a/charts/fullstack-deployment/templates/cert-manager/certificate-requests.yaml b/charts/fullstack-deployment/templates/cert-manager/certificate-requests.yaml
@@ -0,0 +1,28 @@
+{{- if or $.Values.cloud.selfSignedClusterIssuer.enabled (index $.Values "hedera-explorer" "certClusterIssuerType" | ne "self-signed" ) }}
+{{- if index $.Values "hedera-explorer" "enabled" | eq true }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: ca-secret-hedera-explorer
+  namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
+spec:
+  isCA: false
+  commonName: {{ index $.Values "hedera-explorer" "ingress" "hosts" 0 "host" }}
+  dnsNames:
+    - {{ index $.Values "hedera-explorer" "ingress" "hosts" 0 "host" }}
+  secretName: ca-secret-hedera-explorer
+  privateKey:
+    algorithm: RSA
+    size: 3072
+  issuerRef:
+    {{- if index .Values "hedera-explorer" "certClusterIssuerType" | eq "self-signed"}}
+    name: {{ tpl (index .Values "hedera-explorer" "selfSignedCertClusterIssuer") . }}
+    {{- else if index .Values "hedera-explorer" "certClusterIssuerType" | eq "acme-staging" }}
+    name: {{ tpl (index .Values "acme-cluster-issuer" "issuers" "staging" "name") . }}
+    {{- else if index .Values "hedera-explorer" "certClusterIssuerType" | eq "acme-prod" }}
+    name: {{ tpl (index .Values "acme-cluster-issuer" "issuers" "production" "name") . }}
+    {{- end }}
+    kind: ClusterIssuer
+    group: cert-manager.io
+{{- end }}
+{{- end }}
diff --git a/charts/fullstack-deployment/templates/cert-manager/cluster-issuer.yaml b/charts/fullstack-deployment/templates/cert-manager/cluster-issuer.yaml
@@ -2,7 +2,7 @@
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-  name: self-signed
+  name: {{ tpl (index .Values "hedera-explorer" "selfSignedCertClusterIssuer") . }}
   namespace: cert-manager
   annotations:
     helm.sh/hook: post-install

diff --git a/charts/fullstack-deployment/templates/gateway-api/certificate-requests.yaml b/charts/fullstack-deployment/templates/gateway-api/certificate-requests.yaml
-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 @@