update app names

Author: zubenkoivan

charts/platform/templates/_helpers.tpl

@@ -68,6 +68,9 @@ release: {{ .Release.Name | quote }}
 
 {{- define "platform.argocd.application" -}}
 {{- $root := .root -}}
+{{- $clusterName := include "platform.clusterName" $root -}}
+{{- $defaultName := printf "%s--%s" $clusterName .name -}}
+{{- $name := ternary .name $defaultName (contains $clusterName .name) -}}
 {{- $project := default "default" $root.Values.argocd.project -}}
 {{- $destServer := default "https://kubernetes.default.svc" $root.Values.argocd.destination.server -}}
 {{- $destNs := default $root.Release.Namespace $root.Values.argocd.destination.namespace -}}
@@ -80,7 +83,7 @@ release: {{ .Release.Name | quote }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: {{ .name | trunc 63 | trimSuffix "-" }}
+  name: {{ $name | trunc 63 | trimSuffix "-" }}
   labels:
     {{- include "platform.labels.common" $root | nindent 4 }}
     {{- if gt (len $labels) 0 }}
@@ -107,8 +110,10 @@ spec:
     chart: {{ required (printf "chart for %s application is required" .name) .chart }}
     targetRevision: {{ .targetRevision | default "latest" | quote }}
     helm:
-      {{- with .releaseName }}
-      releaseName: {{ . }}
+      {{- if .releaseName }}
+      releaseName: {{ .releaseName }}
+      {{- else }}
+      releaseName: {{ .name }}
       {{- end }}
       {{- with $helmValues }}
       valuesObject:

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

@@ -30,6 +30,8 @@ route:
 
 {{- define "platform.argocd.applications.kubePrometheusStack.values" -}}
 {{- $platformTokenSecretName := dig "valueFrom" "secretKeyRef" "name" "" (include "platform.token" . | fromYaml) -}}
+nameOverride: prometheus
+fullnameOverride: prometheus
 global:
   imageRegistry: ghcr.io
   {{- with .Values.imagePullSecrets }}

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

@@ -8,7 +8,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: alloy
+      name: test-cluster--alloy
     spec:
       destination:
         namespace: platform
@@ -17,6 +17,7 @@ should match snapshot:
       source:
         chart: alloy
         helm:
+          releaseName: alloy
           valuesObject:
             alloy:
               configMap:

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

@@ -8,7 +8,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: docker-registry
+      name: test-cluster--docker-registry
     spec:
       destination:
         namespace: platform
@@ -17,6 +17,7 @@ should match snapshot:
       source:
         chart: docker-registry
         helm:
+          releaseName: docker-registry
           valuesObject:
             configData:
               storage:

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

@@ -10,7 +10,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: external-secrets
+      name: test-cluster--external-secrets
     spec:
       destination:
         namespace: platform
@@ -19,6 +19,7 @@ should match snapshot:
       source:
         chart: external-secrets
         helm:
+          releaseName: external-secrets
           valuesObject:
             installCRDs: true
             podLabels:

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

@@ -8,7 +8,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: grafana
+      name: test-cluster--grafana
     spec:
       destination:
         namespace: platform
@@ -17,6 +17,7 @@ should match snapshot:
       source:
         chart: grafana
         helm:
+          releaseName: grafana
           valuesObject:
             dashboardProviders:
               dashboardproviders.yaml:

charts/platform/tests/__snapshot__/keda-add-ons-http-application_test.yaml.snap

@@ -8,7 +8,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: keda-add-ons-http
+      name: test-cluster--keda-add-ons-http
     spec:
       destination:
         namespace: platform
@@ -17,6 +17,7 @@ should match snapshot:
       source:
         chart: keda-add-ons-http
         helm:
+          releaseName: keda-add-ons-http
           valuesObject:
             interceptor:
               replicas:

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

@@ -10,7 +10,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: keda
+      name: test-cluster--keda
     spec:
       destination:
         namespace: platform
@@ -19,6 +19,7 @@ should match snapshot:
       source:
         chart: keda
         helm:
+          releaseName: keda
           valuesObject:
             operator:
               replicaCount: 1

charts/platform/tests/__snapshot__/kube-prometheus-stack-application_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: prometheus
+      name: test-cluster--prometheus
     spec:
       destination:
         namespace: platform
@@ -19,6 +19,7 @@ should match snapshot:
       source:
         chart: kube-prometheus-stack
         helm:
+          releaseName: prometheus
           valuesObject:
             alertmanager:
               alertmanagerSpec:
@@ -61,6 +62,7 @@ should match snapshot:
               enabled: false
             defaultRules:
               create: false
+            fullnameOverride: prometheus
             global:
               imageRegistry: ghcr.io
             grafana:
@@ -122,6 +124,7 @@ should match snapshot:
               serviceMonitor:
                 additionalLabels:
                   platform.apolo.us/scrape-metrics: "true"
+            nameOverride: prometheus
             nodeExporter:
               enabled: true
             prometheus:

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

@@ -8,7 +8,7 @@ should match snapshot:
         chart: platform-1.0.0
         heritage: Helm
         release: platform
-      name: loki
+      name: test-cluster--loki
     spec:
       destination:
         namespace: platform
@@ -17,6 +17,7 @@ should match snapshot:
       source:
         chart: loki
         helm:
+          releaseName: loki
           valuesObject:
             backend:
               podLabels: