diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml index 527f15a3..87a94cab 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml @@ -4,7 +4,6 @@ kind: ClusterRole metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml index 55011031..80ae4db8 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml @@ -4,7 +4,6 @@ kind: ClusterRoleBinding metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index 6823253b..e93c6906 100644 --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml @@ -4,7 +4,6 @@ kind: Deployment metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -15,7 +14,7 @@ spec: selector: matchLabels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} revisionHistoryLimit: 5 replicas: 1 template: @@ -27,7 +26,6 @@ spec: {{- end }} {{- end }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml b/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml index 3284e1a1..092eb4c1 100644 --- a/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml @@ -9,7 +9,6 @@ metadata: {{- end }} {{- end }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -27,6 +26,6 @@ spec: port: {{ .Values.controller.metrics.service.servicePort }} targetPort: controller selector: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-application-controller/role.yaml b/charts/argo-cd/templates/argocd-application-controller/role.yaml index a3c93860..2992bddb 100644 --- a/charts/argo-cd/templates/argocd-application-controller/role.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/role.yaml @@ -4,7 +4,6 @@ kind: Role metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml index 3e1d9005..2bd42a48 100644 --- a/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml @@ -4,7 +4,6 @@ kind: RoleBinding metadata: name: {{ template "argo-cd.controller.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-application-controller/service.yaml b/charts/argo-cd/templates/argocd-application-controller/service.yaml index 9cbaabee..05610e7e 100644 --- a/charts/argo-cd/templates/argocd-application-controller/service.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/service.yaml @@ -10,7 +10,6 @@ metadata: {{- end }} name: {{ template "argo-cd.controller.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -23,6 +22,6 @@ spec: port: {{ .Values.controller.service.port }} targetPort: {{ .Values.controller.containerPort }} selector: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml index 5950315d..e08b439d 100644 --- a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml @@ -4,7 +4,6 @@ kind: ServiceAccount metadata: name: {{ template "argo-cd.controllerServiceAccountName" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml index bf866ca9..0a797afb 100644 --- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml @@ -27,7 +27,6 @@ spec: - {{ .Release.Namespace }} selector: matchLabels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics app.kubernetes.io/component: {{ .Values.controller.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml index 8d13ad25..a2ea527f 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml @@ -4,7 +4,6 @@ kind: ConfigMap metadata: name: argocd-cm labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-cm helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml index e56b8fe6..dfdf4a58 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml @@ -4,7 +4,6 @@ kind: ConfigMap metadata: name: argocd-rbac-cm labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-rbac-cm helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml index 6cab51bf..3bb94c5f 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml @@ -4,7 +4,6 @@ kind: Secret metadata: name: argocd-secret labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-secret helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml index a3985e0e..62d5b7d8 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml @@ -4,7 +4,6 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-ssh-known-hosts-cm helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml index 622a7ed9..d7ae63f5 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml @@ -4,7 +4,6 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-tls-certs-cm helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 8e3cef47..52e6fec5 100644 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -4,7 +4,6 @@ kind: Deployment metadata: name: {{ template "argo-cd.repoServer.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -15,7 +14,7 @@ spec: selector: matchLabels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} revisionHistoryLimit: 5 replicas: 1 template: @@ -27,7 +26,6 @@ spec: {{- end }} {{- end }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml b/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml index e24e41e0..eee0008f 100644 --- a/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml @@ -9,7 +9,6 @@ metadata: {{- end }} {{- end }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -27,6 +26,6 @@ spec: port: {{ .Values.repoServer.metrics.service.servicePort }} targetPort: metrics selector: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-repo-server/service.yaml b/charts/argo-cd/templates/argocd-repo-server/service.yaml index fe34ea8e..1b676b71 100644 --- a/charts/argo-cd/templates/argocd-repo-server/service.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/service.yaml @@ -23,6 +23,6 @@ spec: port: {{ .Values.repoServer.service.port }} targetPort: repo-server selector: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml index d896e58a..910d6b60 100644 --- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml @@ -27,7 +27,7 @@ spec: - {{ .Release.Namespace }} selector: matchLabels: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics app.kubernetes.io/component: {{ .Values.repoServer.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 964b296f..e05e284b 100644 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -4,7 +4,6 @@ kind: Deployment metadata: name: {{ template "argo-cd.server.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -15,7 +14,7 @@ spec: selector: matchLabels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} revisionHistoryLimit: 5 replicas: 1 template: @@ -27,7 +26,6 @@ spec: {{- end }} {{- end }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/argocd-server/metrics-service.yaml b/charts/argo-cd/templates/argocd-server/metrics-service.yaml index 8916cc7a..fd470257 100644 --- a/charts/argo-cd/templates/argocd-server/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-server/metrics-service.yaml @@ -9,7 +9,6 @@ metadata: {{- end }} {{- end }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -27,6 +26,6 @@ spec: port: {{ .Values.server.metrics.service.servicePort }} targetPort: metrics selector: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml index 8823c737..aba5e9e5 100644 --- a/charts/argo-cd/templates/argocd-server/service.yaml +++ b/charts/argo-cd/templates/argocd-server/service.yaml @@ -28,6 +28,6 @@ spec: port: {{ .Values.server.service.servicePortHttps }} targetPort: {{ .Values.server.name }} selector: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml index 00ff9ae4..338b69ed 100644 --- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml @@ -27,7 +27,7 @@ spec: - {{ .Release.Namespace }} selector: matchLabels: - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics app.kubernetes.io/component: {{ .Values.server.name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index 59db5522..92576db1 100644 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -4,7 +4,6 @@ kind: Deployment metadata: name: {{ template "argo-cd.dex.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -15,11 +14,10 @@ spec: selector: matchLabels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/dex/role.yaml b/charts/argo-cd/templates/dex/role.yaml index 3e394b79..ee2bf02f 100644 --- a/charts/argo-cd/templates/dex/role.yaml +++ b/charts/argo-cd/templates/dex/role.yaml @@ -4,7 +4,6 @@ kind: Role metadata: name: {{ template "argo-cd.dex.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/dex/rolebinding.yaml b/charts/argo-cd/templates/dex/rolebinding.yaml index 949008a4..508ec0dd 100644 --- a/charts/argo-cd/templates/dex/rolebinding.yaml +++ b/charts/argo-cd/templates/dex/rolebinding.yaml @@ -4,7 +4,6 @@ kind: RoleBinding metadata: name: {{ template "argo-cd.dex.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/argo-cd/templates/dex/service.yaml b/charts/argo-cd/templates/dex/service.yaml index 11764b1d..2e1899c4 100644 --- a/charts/argo-cd/templates/dex/service.yaml +++ b/charts/argo-cd/templates/dex/service.yaml @@ -4,7 +4,6 @@ kind: Service metadata: name: {{ template "argo-cd.dex.fullname" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -23,5 +22,5 @@ spec: targetPort: grpc selector: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} - release: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/dex/serviceaccount.yaml b/charts/argo-cd/templates/dex/serviceaccount.yaml index 110116b1..bdd9f1b0 100644 --- a/charts/argo-cd/templates/dex/serviceaccount.yaml +++ b/charts/argo-cd/templates/dex/serviceaccount.yaml @@ -4,7 +4,6 @@ kind: ServiceAccount metadata: name: {{ template "argo-cd.dexServiceAccountName" . }} labels: - release: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }} helm.sh/chart: {{ include "argo-cd.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }}