update destination namespace

Author: zubenkoivan

charts/platform/templates/_helpers.tpl

@@ -63,7 +63,13 @@ release: {{ .Release.Name | quote }}
 {{- end -}}
 
 {{- define "platform.priorityClassName" -}}
-{{- default (printf "%s-services" .Release.Namespace) .Values.defaultPriorityClassName -}}
+{{- $namespace := include "platform.argocd.destination.namespace" . -}}
+{{- $priorityClassName := printf "%s-services" $namespace -}}
+{{- default $priorityClassName .Values.defaultPriorityClassName -}}
+{{- end -}}
+
+{{- define "platform.argocd.destination.namespace" -}}
+{{- required "argocd.destination.namespace is required" .Values.argocd.destination.namespace -}}
 {{- end -}}
 
 {{- define "platform.argocd.application" -}}

charts/platform/templates/alloy-application.yaml

@@ -1,4 +1,5 @@
 {{- define "platform.argocd.applications.alloy.values" -}}
+{{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 global:
   podSecurityContext:
     runAsUser: 473
@@ -13,7 +14,7 @@ alloy:
     content: |
       loki.write "default" {
         endpoint {
-          url = "http://loki-gateway.{{ .Release.Namespace }}.svc.cluster.local/loki/api/v1/push"
+          url = "http://loki-gateway.{{ $platformNamespace }}.svc.cluster.local/loki/api/v1/push"
         }
       }
 

charts/platform/templates/kube-prometheus-stack-application.yaml

@@ -30,6 +30,7 @@ route:
 
 {{- define "platform.argocd.applications.kubePrometheusStack.values" -}}
 {{- $platformTokenSecretName := dig "valueFrom" "secretKeyRef" "name" "" (include "platform.token" . | fromYaml) -}}
+{{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 nameOverride: prometheus
 fullnameOverride: prometheus
 global:
@@ -47,7 +48,7 @@ kubeApiServer:
       platform.apolo.us/scrape-metrics: "true"
 kubelet:
   enabled: true
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ $platformNamespace }}
   serviceMonitor:
     additionalLabels:
       platform.apolo.us/scrape-metrics: "true"
@@ -158,7 +159,7 @@ prometheusOperator:
     additionalLabels:
       platform.apolo.us/scrape-metrics: "true"
   kubeletService:
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ $platformNamespace }}
   priorityClassName: {{ include "platform.priorityClassName" . }}
 prometheus:
   prometheusSpec:
@@ -207,7 +208,7 @@ prometheus:
     ingressClassName: {{ . }}
     {{- end }}
     annotations:
-      traefik.ingress.kubernetes.io/router.middlewares: {{ .Release.Namespace }}-{{ .Release.Name }}-federated-prometheus-auth@kubernetescrd
+      traefik.ingress.kubernetes.io/router.middlewares: {{ $platformNamespace }}-{{ .Release.Name }}-federated-prometheus-auth@kubernetescrd
       traefik.ingress.kubernetes.io/router.priority: "1000"
     hosts:
     - prometheus.{{ include "platform.clusterDnsName" . }}

charts/platform/templates/platform-api-poller-application.yaml

@@ -1,5 +1,6 @@
 {{- define "platform.argocd.applications.platformApiPoller.values" -}}
 {{- $platformUrls := include "platform.urls" . | fromYaml -}}
+{{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 image:
   repository: ghcr.io/neuro-inc/platformapi
 platform:
@@ -15,8 +16,8 @@ platform:
 jobs:
   namespace: platform-jobs
   ingressClass: {{ .Values.defaultIngressClassName }}
-  ingressAuthMiddleware: {{ printf "%s-%s-ingress-auth@kubernetescrd" .Release.Namespace .Release.Name }}
-  ingressErrorPageMiddleware: {{ printf "%s-%s-error-page@kubernetescrd" .Release.Namespace .Release.Name }}
+  ingressAuthMiddleware: {{ printf "%s-%s-ingress-auth@kubernetescrd" $platformNamespace .Release.Name }}
+  ingressErrorPageMiddleware: {{ printf "%s-%s-error-page@kubernetescrd" $platformNamespace .Release.Name }}
   ingressOAuthAuthorizeUrl: {{ printf "%s/oauth/authorize" (get $platformUrls "ingressAuthUrl") }}
 nodeLabels:
   job: {{ .Values.nodeLabels.job }}

charts/platform/templates/platform-monitoring-application.yaml

@@ -1,5 +1,6 @@
 {{- define "platform.argocd.applications.platformMonitoring.values" -}}
 {{- $platformUrls := include "platform.urls" . | fromYaml -}}
+{{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 nameOverride: {{ printf "%s-monitoring" .Release.Name }}
 fullnameOverride: {{ printf "%s-monitoring" .Release.Name }}
 image:
@@ -28,7 +29,7 @@ logs:
   persistence:
     type: loki
     loki:
-      endpoint: {{ printf "http://loki-read.%s:3100" .Release.Namespace }}
+      endpoint: {{ printf "http://loki-read.%s:3100" $platformNamespace }}
       archiveDelay: 5
       retentionPeriodS: 2592000  # 30 days
 service:

charts/platform/templates/platform-reports-application.yaml

@@ -1,5 +1,6 @@
 {{- define "platform.argocd.applications.platformReports.values" -}}
 {{- $platformUrls := include "platform.urls" . | fromYaml -}}
+{{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 image:
   repository: ghcr.io/neuro-inc/platform-reports
 securityContext:
@@ -43,7 +44,7 @@ grafanaProxy:
     - {{ printf "grafana.%s" (include "platform.clusterDnsName" .) }}
     - {{ printf "metrics.%s" (include "platform.clusterDnsName" .) }}
     annotations:
-      traefik.ingress.kubernetes.io/router.middlewares: {{ printf "%s-%s-ingress-auth@kubernetescrd" .Release.Namespace .Release.Name }}
+      traefik.ingress.kubernetes.io/router.middlewares: {{ printf "%s-%s-ingress-auth@kubernetescrd" $platformNamespace .Release.Name }}
 priorityClassName: {{ include "platform.priorityClassName" . }}
 {{- with .Values.sentry }}
 sentry:

charts/platform/templates/traefik-application.yaml

@@ -1,4 +1,5 @@
 {{- define "platform.argocd.applications.traefik.values" -}}
+{{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 image:
   name: ghcr.io/neuro-inc/traefik
 deployment:
@@ -15,7 +16,7 @@ deployment:
 additionalArguments:
   - --entryPoints.websecure.proxyProtocol.insecure=true
   - --entryPoints.websecure.forwardedHeaders.insecure=true
-  - --entryPoints.websecure.http.middlewares={{ printf "%s-%s-cors@kubernetescrd" .Release.Namespace .Release.Name }}
+  - --entryPoints.websecure.http.middlewares={{ printf "%s-%s-cors@kubernetescrd" $platformNamespace .Release.Name }}
   - --providers.kubernetesingress.ingressendpoint.ip=1.2.3.4
 instanceLabelOverride: {{ .Release.Name }}
 resources:

charts/platform/tests/__snapshot__/alloy-application_test.yaml.snap

@@ -11,7 +11,7 @@ should match snapshot:
       name: test-cluster--alloy
     spec:
       destination:
-        namespace: argocd
+        namespace: platform
         server: https://kubernetes.default.svc
       project: default
       source:

charts/platform/tests/__snapshot__/docker-registry-application_test.yaml.snap

@@ -11,7 +11,7 @@ should match snapshot:
       name: test-cluster--docker-registry
     spec:
       destination:
-        namespace: argocd
+        namespace: platform
         server: https://kubernetes.default.svc
       project: default
       source:

charts/platform/tests/__snapshot__/external-secrets-application_test.yaml.snap

@@ -13,7 +13,7 @@ should match snapshot:
       name: test-cluster--external-secrets
     spec:
       destination:
-        namespace: argocd
+        namespace: platform
         server: https://kubernetes.default.svc
       project: default
       source: