From 97173473d4cd455045796ed176845f5f8c30f8ae Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Fri, 16 May 2025 20:57:53 -0500 Subject: [PATCH] change labels --- .../argocd/templates/external-secret.yaml | 11 ++--------- .../argocd/templates/http-route.yaml | 5 +---- .../stack/templates/application-set.yaml | 3 --- .../stack/templates/application.yaml | 19 +++++++++++++++++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml b/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml index 8a5f4c1e5..20a9be644 100644 --- a/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml +++ b/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml @@ -4,11 +4,8 @@ metadata: name: argocd-oidc-secret namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: argocd-oidc-secret + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: server - app.kubernetes.io/part-of: argocd spec: secretStoreRef: kind: ClusterSecretStore @@ -36,12 +33,8 @@ spec: # name: argocd-gitea-repo-infrastructure-secret # namespace: {{ .Release.Namespace }} # labels: -# app.kubernetes.io/name: argocd-gitea-repo-infrastructure-secret +# app.kubernetes.io/name: {{ .Release.Name }} # app.kubernetes.io/instance: {{ .Release.Name }} -# app.kubernetes.io/version: {{ .Chart.AppVersion }} -# app.kubernetes.io/component: repo -# app.kubernetes.io/part-of: argocd -# argocd.argoproj.io/secret-type: repository # spec: # secretStoreRef: # kind: ClusterSecretStore diff --git a/clusters/cl01tl/deployment/argocd/templates/http-route.yaml b/clusters/cl01tl/deployment/argocd/templates/http-route.yaml index 263e5fb99..fdc5bb9b2 100644 --- a/clusters/cl01tl/deployment/argocd/templates/http-route.yaml +++ b/clusters/cl01tl/deployment/argocd/templates/http-route.yaml @@ -4,11 +4,8 @@ metadata: name: http-route-argocd namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: http-route-argocd + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: parentRefs: - group: gateway.networking.k8s.io diff --git a/clusters/cl01tl/deployment/stack/templates/application-set.yaml b/clusters/cl01tl/deployment/stack/templates/application-set.yaml index fd9f5c331..a516992fd 100644 --- a/clusters/cl01tl/deployment/stack/templates/application-set.yaml +++ b/clusters/cl01tl/deployment/stack/templates/application-set.yaml @@ -8,9 +8,6 @@ metadata: labels: app.kubernetes.io/name: {{ $stack.name }} app.kubernetes.io/instance: {{ $stack.name }} - app.kubernetes.io/version: {{ $.Chart.AppVersion }} - app.kubernetes.io/component: {{ $stack.name }} - app.kubernetes.io/part-of: {{ $.Release.Name }} spec: syncPolicy: applicationsSync: create-update diff --git a/clusters/cl01tl/deployment/stack/templates/application.yaml b/clusters/cl01tl/deployment/stack/templates/application.yaml index 7c4d9bdc4..495b18b25 100644 --- a/clusters/cl01tl/deployment/stack/templates/application.yaml +++ b/clusters/cl01tl/deployment/stack/templates/application.yaml @@ -3,6 +3,9 @@ kind: Application metadata: name: cilium namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ $stack.name }} + app.kubernetes.io/instance: {{ $stack.name }} finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -42,6 +45,9 @@ kind: Application metadata: name: coredns namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ $stack.name }} + app.kubernetes.io/instance: {{ $stack.name }} finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -57,7 +63,7 @@ spec: syncPolicy: automated: prune: true - selfHeal: false + selfHeal: true retry: limit: 10 backoff: @@ -76,6 +82,9 @@ kind: Application metadata: name: metrics-server namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ $stack.name }} + app.kubernetes.io/instance: {{ $stack.name }} finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -91,7 +100,7 @@ spec: syncPolicy: automated: prune: true - selfHeal: false + selfHeal: true retry: limit: 10 backoff: @@ -110,6 +119,9 @@ kind: Application metadata: name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ $stack.name }} + app.kubernetes.io/instance: {{ $stack.name }} finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -144,6 +156,9 @@ kind: Application metadata: name: prometheus-operator-crds namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ $stack.name }} + app.kubernetes.io/instance: {{ $stack.name }} finalizers: - resources-finalizer.argocd.argoproj.io spec: