From 0bc4be4e2a4878d83e3d72b90a725ebf3547ea39 Mon Sep 17 00:00:00 2001 From: abdennour Date: Mon, 8 Mar 2021 02:07:12 +0300 Subject: [PATCH 1/4] 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" . }} From 624f1eb8aa51f4e05fa325c600f03bf113896bae Mon Sep 17 00:00:00 2001 From: Giannis Skoulis Date: Mon, 8 Mar 2021 18:23:41 +0100 Subject: [PATCH 2/4] chore(argo-cd): upgrade redis-ha to v4.10.4 (#608) Changelog: https://github.com/DandyDeveloper/charts/compare/9a334385...a83e96da Signed-off-by: Ioannis Skoulis --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- charts/argo-cd/requirements.lock | 6 +++--- charts/argo-cd/requirements.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 51daa42b..2f824d08 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.8 +version: 2.14.9 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 8c3aefbf..edfff5f5 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -333,7 +333,7 @@ through `xxx.extraArgs` | redis.securityContext | Redis Pod Security Context | See [values.yaml](values.yaml) | | redis.servicePort | Redis service port | `6379` | | redis.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` | -| redis-ha | Configures [Redis HA subchart](https://github.com/helm/charts/tree/master/stable/redis-ha) The properties below have been changed from the subchart defaults | | +| redis-ha | Configures [Redis HA subchart](https://github.com/DandyDeveloper/charts/tree/master/charts/redis-ha) The properties below have been changed from the subchart defaults | | | redis-ha.enabled | Enables the Redis HA subchart and disables the custom Redis single node deployment| `false` | | redis-ha.exporter.enabled | If `true`, the prometheus exporter sidecar is enabled | `true` | | redis-ha.persistentVolume.enabled | Configures persistency on Redis nodes | `false` diff --git a/charts/argo-cd/requirements.lock b/charts/argo-cd/requirements.lock index fd400f51..45d95b5b 100644 --- a/charts/argo-cd/requirements.lock +++ b/charts/argo-cd/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: redis-ha repository: https://dandydeveloper.github.io/charts/ - version: 4.10.1 -digest: sha256:e1e0526ad009ecc065df937b48c4e0e5877e5194242c7888b1dc4467775f2663 -generated: "2020-12-14T14:00:30.830130403+01:00" + version: 4.10.4 +digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2 +generated: "2021-03-03T10:13:21.0955491+01:00" diff --git a/charts/argo-cd/requirements.yaml b/charts/argo-cd/requirements.yaml index 82c0ed62..fad20e4a 100644 --- a/charts/argo-cd/requirements.yaml +++ b/charts/argo-cd/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: redis-ha - version: 4.10.1 + version: 4.10.4 repository: https://dandydeveloper.github.io/charts/ condition: redis-ha.enabled From cf399e6ddaa3cdbfae5c0bd454bd3cfe040f2998 Mon Sep 17 00:00:00 2001 From: Zichao Qi Date: Mon, 8 Mar 2021 09:45:08 -0800 Subject: [PATCH 3/4] fix: use quote for keyFormat (#607) Signed-off-by: qizichao-dm --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-config-map.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index e985a33e..d519e34c 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.16.6 +version: 0.16.7 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index 94b0bad6..26fe2cd8 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -53,7 +53,7 @@ data: endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio:9000") }} insecure: {{ .Values.artifactRepository.s3.insecure }} {{- if .Values.artifactRepository.s3.keyFormat }} - keyFormat: {{ .Values.artifactRepository.s3.keyFormat }} + keyFormat: {{ .Values.artifactRepository.s3.keyFormat | quote }} {{- end }} {{- if .Values.artifactRepository.s3.region }} region: {{ .Values.artifactRepository.s3.region }} From ff388f8f9402403ee69520f483bb4c05c6ac5b3f Mon Sep 17 00:00:00 2001 From: Matt Gowie Date: Mon, 8 Mar 2021 12:30:24 -0700 Subject: [PATCH 4/4] feat(argo-cd): adds configEnabled flag to allow parent chart to own CM (#591) Signed-off-by: Matt Gowie --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-configs/argocd-cm.yaml | 4 +++- charts/argo-cd/values.yaml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2f824d08..af7da2f2 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.9 +version: 2.15.0 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/templates/argocd-configs/argocd-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml index 0ce489bc..ca42e9b9 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml @@ -1,3 +1,4 @@ +{{- if .Values.server.configEnabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -16,4 +17,5 @@ metadata: {{- end }} {{- end }} data: -{{- toYaml .Values.server.config | nindent 4 }} \ No newline at end of file +{{- toYaml .Values.server.config | nindent 4 }} +{{- end }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 25bf3ad7..fee16b46 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -543,6 +543,7 @@ server: ## ArgoCD config ## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml + configEnabled: true config: # Argo CD's externally facing base URL (optional). Required when configuring SSO url: https://argocd.example.com