feat(argo-cd): setting gateway resources namespace from tpl "argo-cd.namespace"

Signed-off-by: Tristan Duverger <tristan.duverger@gmail.com>

charts/argo-cd/README.md

@@ -1046,8 +1046,8 @@ NAME: my-release
 | server.gateway.httpRoute.pathType | string | `PathPrefix` (See [values.yaml]) | HTTP reoute path type. Either 'Exact' or `PathPrefix` |
 | server.gateway.labels | object | `{}` | Additional gateway labels |
 | server.gateway.listeners | list | Listen on http. | Gateway listeners |
-| server.gateway.name | string | `""` (calculated with template "argo-cd.server.fullname") (See [values.yaml]) | Name of the gateway |
+| server.gateway.name | string | `'{{ include "argo-cd.server.fullname" . }}'` (See [values.yaml]) | Name of the gateway |
-| server.gateway.namespace | string | `.Release.Namespace` (See [values.yaml]) | Name of the namespace gateway |
+| server.gateway.namespace | string | `'{{ include  "argo-cd.namespace" . }}'` (See [values.yaml]) | Name of the namespace gateway |
 | server.hostNetwork | bool | `false` | Host Network for Server pods |
 | server.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Argo CD server |
 | server.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the Argo CD server |

charts/argo-cd/templates/argocd-server/gateway-httproute.yaml

@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: {{ include "argo-cd.server.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.gateway.httpRoute.labels }}
@@ -19,8 +19,8 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: {{ .Values.server.gateway.name | default (include "argo-cd.server.fullname" .) }}
+      name: {{ tpl (toString .Values.server.gateway.name) . }}
-      namespace: {{ .Values.server.gateway.namespace | default .Release.Namespace }}
+      namespace: {{ tpl (toString .Values.server.gateway.namespace) . }}
       {{- with .Values.server.gateway.httpRoute.gatewaySection }}
       sectionName: {{ . }}
       {{- end }}

charts/argo-cd/templates/argocd-server/gateway.yaml

@@ -2,8 +2,8 @@
 kind: Gateway
 apiVersion: gateway.networking.k8s.io/v1
 metadata:
-  name: {{ .Values.server.gateway.name | default (include "argo-cd.server.fullname" .) }}
+  name: {{ tpl (toString .Values.server.gateway.name) . }}
-  namespace: {{ .Values.server.gateway.namespace | default .Release.Namespace }}
+  namespace: {{ tpl (toString .Values.server.gateway.namespace) . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.gateway.labels }}

charts/argo-cd/templates/argocd-server/gke/backend-policy.yaml

@@ -3,7 +3,7 @@ apiVersion: networking.gke.io/v1
 kind: GCPBackendPolicy
 metadata:
   name: {{ include "argo-cd.server.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.gateway.gke.GCPBackendPolicy.labels }}

charts/argo-cd/templates/argocd-server/gke/gateway-policy.yaml

@@ -3,7 +3,7 @@ apiVersion: networking.gke.io/v1
 kind: GCPGatewayPolicy
 metadata:
   name: {{ include "argo-cd.server.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ tpl (toString .Values.server.gateway.namespace) . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.gateway.gke.GCPGatewayPolicy.labels }}
@@ -23,5 +23,5 @@ spec:
   targetRef:
     group: gateway.networking.k8s.io
     kind: Gateway
-    name: {{ include "argo-cd.server.fullname" . }}
+    name: {{ tpl (toString .Values.server.gateway.name) . }}
 {{- end }}

charts/argo-cd/templates/argocd-server/gke/healthcheck-policy.yaml

@@ -3,7 +3,7 @@ apiVersion: networking.gke.io/v1
 kind: HealthCheckPolicy
 metadata:
   name: {{ include "argo-cd.server.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.gateway.gke.HealthCheckPolicy.labels }}

charts/argo-cd/values.yaml

@@ -2158,11 +2158,11 @@ server:
     ## Note: you can already have an existing Gateway and just wanted to add a route and backend policy to that Gateway, let false in that case
     enabled: false
     # -- Name of the gateway
-    # @default -- `""` (calculated with template "argo-cd.server.fullname") (See [values.yaml])
+    # @default -- `'{{ include "argo-cd.server.fullname" . }}'` (See [values.yaml])
-    name: ""
+    name: '{{ include "argo-cd.server.fullname" . }}'
     # -- Name of the namespace gateway
-    # @default -- `.Release.Namespace` (See [values.yaml])
+    # @default -- `'{{ include  "argo-cd.namespace" . }}'` (See [values.yaml])
-    namespace: ""
+    namespace: '{{ include  "argo-cd.namespace" . }}'
     # -- Specific implementation for gateway controller. Only `None` and `gke` are supported.
     ## 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`