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

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

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.
 #
@@ -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
@@ -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/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: {{ .name }}
-            class: {{ .class }}
+            {{- with .name }}
+            name: {{ . }}
+            {{- end }}
+            {{- with .class }}
+            class: {{ . }}
+            {{- end }}
+            {{- with $.Values.global.ingressClassName }}
+            ingressClassName: {{ . }}
+            {{- end }}
             serviceType: {{ .serviceType }}
             {{- end }}
           {{- end }}

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: {{ .name }}
-            class: {{ .class }}
+            {{- with .name }}
+            name: {{ . }}
+            {{- end }}
+            {{- with .class }}
+            class: {{ . }}
+            {{- end }}
+            {{- with $.Values.global.ingressClassName }}
+            ingressClassName: {{ . }}
+            {{- end }}
             serviceType: {{ .serviceType }}
             {{- end }}
           {{- end }}

charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml

@@ -1,3 +1,7 @@
+global:
+  namespaceOverride: ""
+  ingressClassName: ""
+
 issuers:
   annotations:
   staging:

charts/fullstack-deployment/charts/hedera-explorer/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 }}

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

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 }}

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