From ec68ef2080d03c68dcd2604b1c9ed8f5d979fee4 Mon Sep 17 00:00:00 2001 From: John Kost <41963650+johnkost@users.noreply.github.com> Date: Tue, 9 Feb 2021 12:32:28 -0500 Subject: [PATCH 1/4] feat(argo-cd): conditionally create the rbac configmap (#569) Signed-off-by: John Kost --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml | 4 +++- charts/argo-cd/values.yaml | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 3d447531..21476976 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.7.11 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.12.0 +version: 2.13.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-rbac-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml index 8bbb7a93..8b7edd55 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml @@ -1,3 +1,4 @@ +{{- if .Values.server.rbacConfigCreate }} apiVersion: v1 kind: ConfigMap metadata: @@ -18,4 +19,5 @@ metadata: {{- if .Values.server.rbacConfig }} data: {{- toYaml .Values.server.rbacConfig | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 7e8d00f3..8ec409e9 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -595,6 +595,10 @@ server: ## Annotations to be added to ArgoCD rbac ConfigMap rbacConfigAnnotations: {} + # Boolean determining whether or not to create the configmap. If false, it is expected tthe configmap will be created + # by something else. ArgoCD will not work if there is no configMap created with the name above. + rbacConfigCreate: true + ## Not well tested and not well supported on release v1.0.0. ## Applications ## reference: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ From 02c31ca0711a2de490ada5dd35d62078b6e0fbb0 Mon Sep 17 00:00:00 2001 From: chgl Date: Tue, 9 Feb 2021 23:54:54 +0100 Subject: [PATCH 2/4] feat(argocd): updated ArgoCD to v1.8.4 (#574) Signed-off-by: chgl --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 21476976..76a42067 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 1.7.11 +appVersion: 1.8.4 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.13.0 +version: 2.14.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/values.yaml b/charts/argo-cd/values.yaml index 8ec409e9..4e4a9397 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -10,7 +10,7 @@ installCRDs: true global: image: repository: argoproj/argocd - tag: v1.7.11 + tag: v1.8.4 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 From e141b401fe056549b37c6af262c98f20625d1dc5 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 9 Feb 2021 19:56:44 -0500 Subject: [PATCH 3/4] Fixed #570: YAML parse error in argocd-notifications/templates/secret.yaml (#573) Signed-off-by: Vitaliy Fuks Co-authored-by: Alexander Matyushentsev --- .github/pull_request_template.md | 4 ++-- charts/argocd-notifications/Chart.yaml | 2 +- charts/argocd-notifications/templates/secret.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 3f860547..1ed7a9f2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,9 +1,9 @@ Checklist: -* [ ] I have update the chart version in `Chart.yaml` following Semantic Versioning. +* [ ] I have updated the chart version in `Chart.yaml` following Semantic Versioning. * [ ] Any new values are backwards compatible and/or have sensible default. * [ ] I have followed the testing instructions in the [contributing guide](https://github.com/argoproj/argo-helm/blob/master/CONTRIBUTING.md). * [ ] I have signed the CLA and the build is green. * [ ] I will test my changes again once merged to master and published. -Changes are automatically published when merged to `master`. They are not published on branches. \ No newline at end of file +Changes are automatically published when merged to `master`. They are not published on branches. diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index ab4f6520..a136f4b5 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.0.1 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD. name: argocd-notifications type: application -version: 1.0.12 +version: 1.0.13 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argocd-notifications/templates/secret.yaml b/charts/argocd-notifications/templates/secret.yaml index c29e8311..11cf4c78 100644 --- a/charts/argocd-notifications/templates/secret.yaml +++ b/charts/argocd-notifications/templates/secret.yaml @@ -8,6 +8,6 @@ metadata: type: Opaque stringData: {{- with .Values.secret.items }} - {{ toYaml . | indent 2 }} + {{ toYaml . | nindent 2 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 1aea2c41798972ff0077108f926bb9095f3f9deb Mon Sep 17 00:00:00 2001 From: Artyom Bakhtin Date: Thu, 11 Feb 2021 13:40:56 +0300 Subject: [PATCH 4/4] feat: allow custom labels in server ingress (#575) Signed-off-by: Artyom Bakhtin --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-ingress.yaml | 3 +++ charts/argo/values.yaml | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 4582dd29..a00271cc 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.15.4 +version: 0.16.0 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/server-ingress.yaml b/charts/argo/templates/server-ingress.yaml index eb0f37e0..6eab3f50 100644 --- a/charts/argo/templates/server-ingress.yaml +++ b/charts/argo/templates/server-ingress.yaml @@ -14,6 +14,9 @@ metadata: chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- range $key, $value := .Values.server.ingress.labels }} + {{ $key }}: {{ $value | quote }} + {{- end }} annotations: {{- range $key, $value := .Values.server.ingress.annotations }} {{ $key }}: {{ $value | quote }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 75642af8..43dc94ae 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -226,6 +226,11 @@ server: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + ## Labels to be added to the web ingress. + ## + # labels: + # use-cloudflare-solver: "true" + ## Hostnames. ## Must be provided if Ingress is enabled. ##