From a8d4216c232dd04b2cda6a3e44cd2b77d484fdf1 Mon Sep 17 00:00:00 2001
From: Tristan Duverger <tristan.duverger@gmail.com>
Date: Fri, 4 Oct 2024 10:55:11 +0200
Subject: [PATCH] feat(argo-cd): support references in spec Signed-off-by:
 Tristan Duverger <tristan.duverger@gmail.com>

---
 .../argocd-server/gke/backend-policy.yaml     |  2 +-
 .../argocd-server/gke/gateway-policy.yaml     |  2 +-
 .../argocd-server/gke/healthcheck-policy.yaml |  2 +-
 charts/argo-cd/values.yaml                    | 36 ++++++++++---------
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-server/gke/backend-policy.yaml b/charts/argo-cd/templates/argocd-server/gke/backend-policy.yaml
index f2e1368f..8fc9ce1d 100644
--- a/charts/argo-cd/templates/argocd-server/gke/backend-policy.yaml
+++ b/charts/argo-cd/templates/argocd-server/gke/backend-policy.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   default:
     {{- with .Values.server.gateway.gke.GCPBackendPolicy.spec.default }}
-      {{- toYaml . | nindent 6 }}
+      {{- tpl (toYaml .) $ | nindent 6 }}
     {{- end }}
   targetRef:
     group: ""
diff --git a/charts/argo-cd/templates/argocd-server/gke/gateway-policy.yaml b/charts/argo-cd/templates/argocd-server/gke/gateway-policy.yaml
index 4d46ae96..befbd76f 100644
--- a/charts/argo-cd/templates/argocd-server/gke/gateway-policy.yaml
+++ b/charts/argo-cd/templates/argocd-server/gke/gateway-policy.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   default:
     {{- with .Values.server.gateway.gke.GCPGatewayPolicy.spec.default }}
-      {{- toYaml . | nindent 6 }}
+      {{- tpl (toYaml .) $ | nindent 6 }}
     {{- end }}
   targetRef:
     group: gateway.networking.k8s.io
diff --git a/charts/argo-cd/templates/argocd-server/gke/healthcheck-policy.yaml b/charts/argo-cd/templates/argocd-server/gke/healthcheck-policy.yaml
index 6c766ab1..b066c60c 100644
--- a/charts/argo-cd/templates/argocd-server/gke/healthcheck-policy.yaml
+++ b/charts/argo-cd/templates/argocd-server/gke/healthcheck-policy.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   default:
     {{- with .Values.server.gateway.gke.HealthCheckPolicy.spec.default }}
-      {{- toYaml . | nindent 6 }}
+      {{- tpl (toYaml .) $ | nindent 6 }}
     {{- end }}
   targetRef:
     group: ""
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index fdff5964..f86a59da 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -2162,8 +2162,6 @@ server:
     ## With `None`, the gateway is supposed to already exist and no specific object will be created
     ## Additional configuration might be required in related configuration sections for `gke`
     controller: None
-    # Argo CD server Gateway API HTTPRoute configuration
-    # NOTE: Alpha feature, gRPC & TLS pass-through will not work
     # -- Additional gateway labels
     labels: {}
     # -- Additional gateway annotations
@@ -2171,8 +2169,7 @@ server:
     #  networking.gke.io/certmap: "CERTIFICATE_MAP"
     gatewayClassName: ""
     # @default -- `""` (See [values.yaml])
-    # gatewayClassName: gke-l7-global-external-managed
-    # gatewayClassName: gke-l7-rilb
+    ## Example: gatewayClassName: gke-l7-global-external-managed
     listeners:
       - name: http
         protocol: HTTP
@@ -2188,34 +2185,41 @@ server:
       #       from: Same
     gke:
       GCPGatewayPolicy:
-        # -- Additional gateway labels
+        # -- Additional gateway policy labels
         labels: {}
-        # -- Additional gateway annotations
+        # -- Additional gateway policy annotations
         annotations: {}
         spec:
+          # @default -- `{}`
+          ## Note: default spec for GCPGatewayPolicy
           default: {}
       GCPBackendPolicy:
-        # -- Additional gateway labels
+        # -- Additional backend policy labels
         labels: {}
-        # -- Additional gateway annotations
+        # -- Additional backend policy annotations
         annotations: {}
         spec:
+          # @default -- `{}` (See [values.yaml])
+          ## Note: default spec for GCPBackendPolicy
           default: {}
       HealthCheckPolicy:
-        # -- Additional gateway labels
+        # -- Additional heath check policy labels
         labels: {}
-        # -- Additional gateway annotations
+        # -- Additional heath check policy annotations
         annotations: {}
         spec:
+          # @default -- `` (See [values.yaml])
+          ## Note: default spec for HealthCheckPolicy. Logs enabled and Heath check on argo server service
           default:
             logConfig:
               enabled: true
-          config:
-            type: HTTP
-            httpHealthCheck:
-              port: '{{ .Values.server.service.servicePortHttp }}'
-              requestPath: "/"
-
+            config:
+              type: HTTP
+              httpHealthCheck:
+                port: 80
+                requestPath: "/"
+    # Argo CD server Gateway API HTTPRoute configuration
+    # NOTE: Alpha feature, gRPC & TLS pass-through will not work
     httpRoute:
       # -- Enable a Gateway HTTP route resources for the Argo CD server
       enabled: "{{ .Values.server.gateway.enabled | default false }}"