From 4ec0b60259c38ccdc0599157d085b961a8461af1 Mon Sep 17 00:00:00 2001 From: Tristan Duverger Date: Fri, 4 Oct 2024 11:17:29 +0200 Subject: [PATCH] feat(argo-cd): setting gateway resources namespace from tpl "argo-cd.namespace" Signed-off-by: Tristan Duverger --- charts/argo-cd/README.md | 4 ++-- .../templates/argocd-server/gateway-httproute.yaml | 6 +++--- charts/argo-cd/templates/argocd-server/gateway.yaml | 4 ++-- .../templates/argocd-server/gke/backend-policy.yaml | 2 +- .../templates/argocd-server/gke/gateway-policy.yaml | 4 ++-- .../templates/argocd-server/gke/healthcheck-policy.yaml | 2 +- charts/argo-cd/values.yaml | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 62dad251..87a2b4fc 100644 --- a/charts/argo-cd/README.md +++ b/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.namespace | string | `.Release.Namespace` (See [values.yaml]) | Name of the namespace gateway | +| server.gateway.name | string | `'{{ include "argo-cd.server.fullname" . }}'` (See [values.yaml]) | Name of the 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 | diff --git a/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml b/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml index 20e43310..5526cadd 100644 --- a/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml +++ b/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" .) }} - namespace: {{ .Values.server.gateway.namespace | default .Release.Namespace }} + name: {{ tpl (toString .Values.server.gateway.name) . }} + namespace: {{ tpl (toString .Values.server.gateway.namespace) . }} {{- with .Values.server.gateway.httpRoute.gatewaySection }} sectionName: {{ . }} {{- end }} diff --git a/charts/argo-cd/templates/argocd-server/gateway.yaml b/charts/argo-cd/templates/argocd-server/gateway.yaml index 7be8d26f..468384a7 100644 --- a/charts/argo-cd/templates/argocd-server/gateway.yaml +++ b/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" .) }} - namespace: {{ .Values.server.gateway.namespace | default .Release.Namespace }} + name: {{ tpl (toString .Values.server.gateway.name) . }} + 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 }} 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 8fc9ce1d..e8488a71 100644 --- a/charts/argo-cd/templates/argocd-server/gke/backend-policy.yaml +++ b/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 }} 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 befbd76f..9eb2dcda 100644 --- a/charts/argo-cd/templates/argocd-server/gke/gateway-policy.yaml +++ b/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 }} 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 b066c60c..0eb64cc9 100644 --- a/charts/argo-cd/templates/argocd-server/gke/healthcheck-policy.yaml +++ b/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 }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 3abfac70..fac6994d 100644 --- a/charts/argo-cd/values.yaml +++ b/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]) - name: "" + # @default -- `'{{ include "argo-cd.server.fullname" . }}'` (See [values.yaml]) + name: '{{ include "argo-cd.server.fullname" . }}' # -- Name of the namespace gateway - # @default -- `.Release.Namespace` (See [values.yaml]) - namespace: "" + # @default -- `'{{ include "argo-cd.namespace" . }}'` (See [values.yaml]) + 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`