chore: changing the instance-of to the cluster to enhance the filtering capability

Author: gambol99

apps/system/system-helm.yaml

@@ -79,6 +79,7 @@ spec:
       annotations:
         argocd.argoproj.io/sync-wave: '{{ default "10" .sync.wave }}'
       labels:
+        app.kubernetes.io/instance: "{{ .metadata.annotations.cluster_name }}"
         app.kubernetes.io/managed-by: argocd
         app.kubernetes.io/name: "{{ normalize (default .feature .release_name) }}"
         app.kubernetes.io/type: helm

apps/system/system-kustomize.yaml

@@ -79,10 +79,12 @@ spec:
       annotations:
         argocd.argoproj.io/sync-wave: '{{ default "15" .sync.wave }}'
       labels:
+        app.kubernetes.io/instance: "{{ .metadata.annotations.cluster_name }}"
         app.kubernetes.io/managed-by: argocd
         app.kubernetes.io/name: "{{ normalize (default .feature .release_name) }}"
         app.kubernetes.io/type: kustomize
         phase: '{{ default "primary" .sync.phase }}'
+        platform.local/type: platform
 
     spec:
       ## The project to use for the application

apps/tenant/apps-helm.yaml

@@ -68,9 +68,9 @@ spec:
       name: "tenant-helm-{{ .path.basenameNormalized }}-{{ .metadata.labels.cluster_name }}"
       namespace: argocd
       labels:
-        app.kubernetes.io/name: "{{ default .path.basenameNormalized .helm.release_name }}"
+        app.kubernetes.io/instance: "{{ .metadata.annotations.cluster_name }}"
         app.kubernetes.io/managed-by: argocd
-        app.kubernetes.io/instance: tenant-helm
+        app.kubernetes.io/name: "{{ default .path.basenameNormalized .helm.release_name }}"
         app.kubernetes.io/part-of: tenant-helm
         app.kubernetes.io/type: helm
         phase: '{{ default "secondary" .sync.phase }}'

apps/tenant/apps-kustomize.yaml

@@ -68,9 +68,9 @@ spec:
       name: "tenant-kust-{{ .path.basenameNormalized }}-{{ .metadata.labels.cluster_name }}"
       namespace: argocd
       labels:
-        app.kubernetes.io/name: "{{ default .path.basenameNormalized .kustomize.release_name }}"
+        app.kubernetes.io/instance: "{{ .metadata.annotations.cluster_name }}"
         app.kubernetes.io/managed-by: argocd
-        app.kubernetes.io/instance: tenant-kustomize
+        app.kubernetes.io/name: "{{ default .path.basenameNormalized .kustomize.release_name }}"
         app.kubernetes.io/part-of: tenant-kustomize
         app.kubernetes.io/type: kustomize
         phase: '{{ default "secondary" .sync.phase }}'

apps/tenant/system-helm.yaml

@@ -70,9 +70,9 @@ spec:
       name: "tenant-helm-{{ .path.basenameNormalized }}-{{ .metadata.labels.cluster_name }}"
       namespace: argocd
       labels:
-        app.kubernetes.io/name: "{{ default .path.basenameNormalized .helm.release_name }}"
+        app.kubernetes.io/instance: "{{ .metadata.annotations.cluster_name }}"
         app.kubernetes.io/managed-by: argocd
-        app.kubernetes.io/instance: tenant-helm
+        app.kubernetes.io/name: "{{ default .path.basenameNormalized .helm.release_name }}"
         app.kubernetes.io/part-of: tenant-helm
         app.kubernetes.io/type: helm
         phase: '{{ default "secondary" .sync.phase }}'

apps/tenant/system-kustomize.yaml

@@ -68,9 +68,9 @@ spec:
       name: "tenant-kust-{{ .path.basenameNormalized }}-{{ .metadata.labels.cluster_name }}"
       namespace: argocd
       labels:
-        app.kubernetes.io/name: "{{ default .path.basenameNormalized .helm.release_name }}"
+        app.kubernetes.io/instance: "{{ .metadata.annotations.cluster_name }}"
         app.kubernetes.io/managed-by: argocd
-        app.kubernetes.io/instance: tenant-kustomize
+        app.kubernetes.io/name: "{{ default .path.basenameNormalized .helm.release_name }}"
         app.kubernetes.io/part-of: tenant-kustomize
         app.kubernetes.io/type: kustomize
         phase: '{{ default "secondary" .sync.phase }}'