From 0bc4be4e2a4878d83e3d72b90a725ebf3547ea39 Mon Sep 17 00:00:00 2001 From: abdennour Date: Mon, 8 Mar 2021 02:07:12 +0300 Subject: [PATCH] fix(argo-cd): hard coded .selector.matchLabels (#603) * fix(argo-cd): hard coded .selector.matchLabels it fixes #602 Signed-off-by: abdennour * style(argo-cd): linting circle ci error too many blank lines it fixes #602 Signed-off-by: abdennour * chore(argo-cd): adding myself to codeowners it is related to #602 Signed-off-by: abdennour * chore(argo-cd): CODEOWNER work by invitation related to #603 #602 Signed-off-by: abdennour * fix(argo-cd): Add info in README about labels Signed-off-by: Sean Johnson Co-authored-by: Sean Johnson --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 4 ++++ .../templates/argocd-application-controller/deployment.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 601494ce..51daa42b 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.8.4 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.14.7 +version: 2.14.8 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 207f260c..8c3aefbf 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -14,6 +14,10 @@ This chart currently installs the non-HA version of ArgoCD. ## Upgrading +### 2.14.7 and above + +The `matchLabels` key in the ArgoCD Appliaction Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource. + ### 2.10.x to 2.11.0 The application controller is now available as a `StatefulSet` when the `controller.enableStatefulSet` flag is set to true. Depending on your Helm deployment this may be a downtime or breaking change if enabled when using HA and will become the default in 3.x. diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index c2260c78..e9a9d700 100755 --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml @@ -14,7 +14,7 @@ metadata: spec: selector: matchLabels: - app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.controller.enableStatefulSet }} serviceName: {{ template "argo-cd.controller.fullname" . }}