feat: switch from envoy gateway to services/ingress (#672)

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>

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"

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.
 #
@@ -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

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

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

charts/fullstack-deployment/Chart.lock

@@ -11,5 +11,8 @@ dependencies:
 - name: acme-cluster-issuer
   repository: ""
   version: 0.3.0
-digest: sha256:65f708d654ba6d14c7b193cc833f132f6133cca53850bcd37cf27809246df0f6
-generated: "2024-01-05T21:23:17.852519Z"
+- name: haproxy-ingress
+  repository: https://haproxy-ingress.github.io/charts
+  version: 0.14.5
+digest: sha256:08303f21e82e6b77a39f6018638b5ba10f180ae420422296bbc5ddcd9f257c4a
+generated: "2024-01-18T13:48:57.467807Z"

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.
 #
@@ -29,10 +29,13 @@ appVersion: "0.17.0"
 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
@@ -47,5 +50,11 @@ dependencies:
 
   - name: acme-cluster-issuer
     version: 0.3.0
-    # TODO: uncomment #repository: https://swirldslabs.github.io/swirldslabs-helm-charts
+    # TODO uncomment #repository: https://swirldslabs.github.io/swirldslabs-helm-charts
+    # TODO once source chart has been updated: https://github.com/hashgraph/full-stack-testing/issues/635
     condition: cloud.acmeClusterIssuer.enabled
+
+  - name: haproxy-ingress
+    version: 0.14.5
+    repository: https://haproxy-ingress.github.io/charts
+    condition: cloud.haproxyIngressController.enabled

charts/fullstack-deployment/templates/gateway-api/certificate-requests.yaml → charts/fullstack-deployment/templates/cert-manager/certificate-requests.yaml

@@ -1,20 +1,22 @@
-{{- if $.Values.gatewayApi.gateway.listeners.hederaExplorer.tlsEnabled }}
+{{- if $.Values.cloud.selfSignedClusterIssuer.enabled }}
+{{- if index $.Values "hedera-explorer" "enabled" | eq true }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ $.Values.gatewayApi.gateway.tlsClusterIssuerName }}-ca-secret-hedera-explorer
+  name: self-signed-ca-secret-hedera-explorer
   namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
 spec:
   isCA: false
   commonName: {{ $.Values.deployment.hederaExplorer.hostname }}
   dnsNames:
     - {{ $.Values.deployment.hederaExplorer.hostname }}
-  secretName: {{ $.Values.gatewayApi.gateway.tlsClusterIssuerName }}-ca-secret-hedera-explorer
+  secretName: self-signed-ca-secret-hedera-explorer
   privateKey:
     algorithm: RSA
     size: 3072
   issuerRef:
-    name: {{ $.Values.gatewayApi.gateway.tlsClusterIssuerName }}
+    name: fst-self-signed-cluster-issuer
     kind: ClusterIssuer
     group: cert-manager.io
 {{- end }}
+{{- end }}

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: fst-self-signed-cluster-issuer
   namespace: cert-manager
   annotations:
     helm.sh/hook: post-install

charts/fullstack-deployment/templates/ingress/ingress-class.yaml

@@ -0,0 +1,8 @@
+{{- if $.Values.cloud.haproxyIngressController.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  name: {{ index $.Values "hedera-explorer" "ingress" "className" }}
+spec:
+  controller: haproxy-ingress.github.io/controller
+{{- end }}

charts/fullstack-deployment/templates/services/haproxy-svc.yaml

@@ -14,9 +14,7 @@ metadata:
     fullstack.hedera.com/prometheus-endpoint: active
     {{- include "fullstack.testLabels" $ | nindent 4 }}
 spec:
-  {{- if default $defaults.loadBalancerEnabled $haproxy.loadBalancerEnabled | eq "true" }}
-  type: LoadBalancer
-  {{- end }}
+  type: {{ $defaults.serviceType | default "ClusterIP" }}
   selector:
     app: haproxy-{{ $node.name }}
   ports: