From c2d9c8125863a5290d1715e14c2fbff7fd3886d2 Mon Sep 17 00:00:00 2001 From: Takeshi Nakata Date: Mon, 27 Apr 2020 09:14:23 +0900 Subject: [PATCH 01/18] feat: add BackendConfig configuration for GKE (#314) * add BackendConfig configuration * update chart version * modify sample secretName --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 ++ .../templates/argocd-server/backendconfig.yaml | 15 +++++++++++++++ charts/argo-cd/values.yaml | 10 ++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 charts/argo-cd/templates/argocd-server/backendconfig.yaml diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index b671caf3..e7863f8f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.8 +version: 2.2.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 adfe7004..ab6bc3b7 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -183,6 +183,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | server.autoscaling.maxReplicas | Maximum number of replicas for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `5` | | server.autoscaling.targetCPUUtilizationPercentage | Average CPU utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` | | server.autoscaling.targetMemoryUtilizationPercentage | Average memory utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` | +| server.GKEbackendConfig.enabled | Enable BackendConfig custom resource for Google Kubernetes Engine. | `false` | +| server.GKEbackendConfig.spec | [BackendConfigSpec](https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom) | `{}` | | server.certificate.additionalHosts | Certificate manager additional hosts | `[]` | | server.certificate.domain | Certificate manager domain | `"argocd.example.com"` | | server.certificate.enabled | Enables a certificate manager certificate. | `false` | diff --git a/charts/argo-cd/templates/argocd-server/backendconfig.yaml b/charts/argo-cd/templates/argocd-server/backendconfig.yaml new file mode 100644 index 00000000..279b3487 --- /dev/null +++ b/charts/argo-cd/templates/argocd-server/backendconfig.yaml @@ -0,0 +1,15 @@ +{{- if .Values.server.GKEbackendConfig.enabled }} +apiVersion: cloud.google.com/v1beta1 +kind: BackendConfig +metadata: + name: {{ template "argo-cd.server.fullname" . }} + labels: + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} + helm.sh/chart: {{ include "argo-cd.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/part-of: argocd + app.kubernetes.io/component: {{ .Values.server.name }} +spec: + {{- toYaml .Values.server.GKEbackendConfig.spec | nindent 2 }} +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index c666453b..682a96f7 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -561,6 +561,16 @@ server: clusterAdminAccess: enabled: true + ## Enable BackendConfig custom resource for Google Kubernetes Engine + GKEbackendConfig: + enabled: false + spec: {} + # spec: + # iap: + # enabled: true + # oauthclientCredentials: + # secretName: argocd-secret + ## Repo Server repoServer: name: repo-server From d0ea218b78a554bf63a2a31ead9e4bc73df7ea5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandru=20=28Alex=29=20Chiri=C8=9Bescu?= Date: Tue, 28 Apr 2020 07:22:52 +0200 Subject: [PATCH 02/18] fix: update argo-cd insecure example in README.md (#279) * fix: update argo-cd insecure example in README.md The docs updated in #265 give a wrong example in the README.md on how to configure the `--insecure` flag: it shows it to be done on the controller, when it should be configured on the server. * Bump chart version --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index e7863f8f..36f5b235 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.9 +version: 2.2.10 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 ab6bc3b7..3858ba73 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -19,9 +19,8 @@ This chart currently installs the non-HA version of ArgoCD. `controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are not arrays of strings intead of a map What was - ```yaml -controller: +server: extraArgs: insecure: "" ``` @@ -29,7 +28,7 @@ controller: is now ```yaml -controller: +server: extraArgs: - --insecure ``` From 28e2d8d31b3c99aaedacf5645470964aac1abf09 Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 28 Apr 2020 17:05:11 +0200 Subject: [PATCH 03/18] Fix usage of openshift.enabled flag (#325) Currently the `openshift.enabled` flag causes the repo server to have an invalid command argument. It's also not documented yet. Signed-off-by: Johannes Siebel --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 1 + charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 36f5b235..700b8582 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.10 +version: 2.2.11 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 3858ba73..f991b464 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -78,6 +78,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` | | configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) | | configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` | +| openshift.enabled | enables using arbitrary uid for argo repo server | `false` | ## ArgoCD Controller diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index e38dd84e..9268cc65 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -52,10 +52,10 @@ spec: image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }} imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }} command: - - argocd-repo-server {{- if .Values.openshift.enabled }} - uid_entrypoint.sh {{- end }} + - argocd-repo-server {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }} - --redis - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }} From 9fd023b6e4c7cb3fce91e62a8916a562ce890cd2 Mon Sep 17 00:00:00 2001 From: Stefan Sedich Date: Tue, 28 Apr 2020 09:54:03 -0700 Subject: [PATCH 04/18] chore: Updating CODEOWNERS for Argo Workflows (#326) --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 50d3195b..4e0014f8 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,7 +7,7 @@ /charts/argo-events @jbehling # Argo Workflows -/charts/argo @benjaminws +/charts/argo @benjaminws @stefansedich # Argo Rollouts /charts/argo-rollouts @cabrinha From 3baf6c81c745738724e35a134722cdbe6591b394 Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Tue, 28 Apr 2020 10:15:23 -0700 Subject: [PATCH 05/18] feat: Adds support for workflow defaults in Argo. (#319) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-config-map.yaml | 3 +++ charts/argo/values.yaml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 4a5e626b..be222ee9 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.6.1" description: A Helm chart for Argo Workflows name: argo -version: 0.7.5 +version: 0.7.6 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 712e4fd5..305428de 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -49,3 +49,6 @@ data: {{- if .Values.controller.persistence }} persistence: {{ toYaml .Values.controller.persistence | indent 6 }}{{- end }} + {{- if .Values.controller.workflowDefaults }} + workflowDefaults: +{{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 4e68c27e..8346d84a 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -47,6 +47,10 @@ controller: # passwordSecret: # name: argo-postgres-config # key: password + workflowDefaults: {} # Only valid for 2.7+ + # spec: + # ttlStrategy: + # secondsAfterCompletion: 84600 telemetryConfig: enabled: false path: /telemetry From 5add526d0c67c9b00d64d9a315fe3902e2a6f59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Prud=27homme?= Date: Wed, 29 Apr 2020 22:01:00 +0200 Subject: [PATCH 06/18] feat: upgrade Argo to v2.7.6 (#296) --- charts/argo/Chart.yaml | 4 ++-- charts/argo/templates/server-deployment.yaml | 1 + charts/argo/values.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index be222ee9..46e747a5 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "v2.6.1" +appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.7.6 +version: 0.8.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-deployment.yaml b/charts/argo/templates/server-deployment.yaml index bbf82dd1..1d716c35 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -31,6 +31,7 @@ spec: - name: argo-server args: - server + - --configmap={{ .Release.Name }}-{{ .Values.controller.name }}-configmap {{- if .Values.server.extraArgs }} {{- toYaml .Values.server.extraArgs | nindent 10 }} {{- end }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 8346d84a..8cbf4542 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -4,7 +4,7 @@ images: server: argocli executor: argoexec pullPolicy: Always - tag: v2.6.1 + tag: v2.7.6 crdVersion: v1alpha1 installCRD: true From 1135b1ef18cbc6e4b29f2d91a40c6d2292b97c8d Mon Sep 17 00:00:00 2001 From: Pablo Osinaga Date: Wed, 29 Apr 2020 22:36:58 +0200 Subject: [PATCH 07/18] fix: Argo Server Secrets Permissions (#307) Grant permissions to workflow-controller and server roles to read database secrets --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-cluster-role.yaml | 11 +++++++++++ .../workflow-controller-clusterrole.yaml | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 46e747a5..a7e383f2 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.0 +version: 0.8.1 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-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml index fbf8d044..0d8103f2 100644 --- a/charts/argo/templates/server-cluster-role.yaml +++ b/charts/argo/templates/server-cluster-role.yaml @@ -28,12 +28,23 @@ rules: - get - list - watch +{{- if .Values.controller.persistence }} - apiGroups: - "" resources: - secrets + resourceNames: + {{- if .Values.controller.persistence.postgresql }} + - {{ .Values.controller.persistence.postgresql.userNameSecret.name }} + - {{ .Values.controller.persistence.postgresql.passwordSecret.name }} + {{- end}} + {{- if .Values.controller.persistence.mysql }} + - {{ .Values.controller.persistence.mysql.userNameSecret.name }} + - {{ .Values.controller.persistence.mysql.passwordSecret.name }} + {{- end}} verbs: - get +{{- end}} - apiGroups: - argoproj.io resources: diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml index 8df46229..2511c1a3 100644 --- a/charts/argo/templates/workflow-controller-clusterrole.yaml +++ b/charts/argo/templates/workflow-controller-clusterrole.yaml @@ -78,4 +78,22 @@ rules: verbs: - get - list +{{- if .Values.controller.persistence }} +- apiGroups: + - "" + resources: + - secrets + resourceNames: + {{- if .Values.controller.persistence.postgresql }} + - {{ .Values.controller.persistence.postgresql.userNameSecret.name }} + - {{ .Values.controller.persistence.postgresql.passwordSecret.name }} + {{- end}} + {{- if .Values.controller.persistence.mysql }} + - {{ .Values.controller.persistence.mysql.userNameSecret.name }} + - {{ .Values.controller.persistence.mysql.passwordSecret.name }} + {{- end}} + verbs: + - get +{{- end}} + From 46e08b1fe8c9f2233e37f8b16c15a68c8e902d15 Mon Sep 17 00:00:00 2001 From: Mark Haley Date: Wed, 29 Apr 2020 21:45:20 -0400 Subject: [PATCH 08/18] feat: Allow custom paths for server ingress (#317) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-ingress.yaml | 7 +++++++ charts/argo/values.yaml | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index a7e383f2..eac1f9e1 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.1 +version: 0.8.2 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 bee5a7f8..eb0f37e0 100644 --- a/charts/argo/templates/server-ingress.yaml +++ b/charts/argo/templates/server-ingress.yaml @@ -24,6 +24,13 @@ spec: - host: {{ . }} http: paths: + {{- if $.Values.server.ingress.paths }} + {{- range $.Values.server.ingress.paths }} + - backend: + serviceName: {{ .serviceName }} + servicePort: {{ .servicePort }} + {{- end }} + {{- end }} - backend: serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 8cbf4542..3c031df2 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -168,6 +168,11 @@ server: # hosts: # - argo.domain.com + ## Additional Paths for each host + # paths: + # - serviceName: "ssl-redirect" + # servicePort: "use-annotation" + ## TLS configuration. ## Secrets must be manually created in the namespace. ## From f2a3adc7f49236ea57819f22e00d9ee024bf1c8d Mon Sep 17 00:00:00 2001 From: ygapon-mio <60629171+ygapon-mio@users.noreply.github.com> Date: Wed, 29 Apr 2020 22:04:07 -0400 Subject: [PATCH 09/18] feat: add support for setting roleARN and useSDKCreds properties for S3 artifact repository (#329) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/workflow-controller-config-map.yaml | 6 ++++++ charts/argo/values.yaml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index eac1f9e1..3f86de62 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.2 +version: 0.8.3 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 305428de..ae73d117 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -39,6 +39,12 @@ data: {{- if .Values.artifactRepository.s3.region }} region: {{ .Values.artifactRepository.s3.region }} {{- end }} + {{- if .Values.artifactRepository.s3.roleARN }} + roleARN: {{ .Values.artifactRepository.s3.roleARN }} + {{- end }} + {{- if .Values.artifactRepository.s3.useSDKCreds }} + useSDKCreds: {{ .Values.artifactRepository.s3.useSDKCreds }} + {{- end }} {{- end}} {{- if .Values.controller.metricsConfig.enabled }} metricsConfig: diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 3c031df2..3bf74b3f 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -200,6 +200,8 @@ artifactRepository: # bucket: # endpoint: # region: + # roleARN: + # useSDKCreds: true # NOTE: These are setting attributes for the `minio` optional dependency minio: From ad34abed7e81514cc7f14369d07d5fb214bcc1f2 Mon Sep 17 00:00:00 2001 From: Kristof Farkas-Pall Date: Thu, 30 Apr 2020 15:29:30 +0100 Subject: [PATCH 10/18] fix: allow server cluster role to delete pods (#278) --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-cluster-role.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 3f86de62..a919ab27 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.3 +version: 0.8.4 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-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml index 0d8103f2..193a5c7b 100644 --- a/charts/argo/templates/server-cluster-role.yaml +++ b/charts/argo/templates/server-cluster-role.yaml @@ -28,6 +28,7 @@ rules: - get - list - watch + - delete {{- if .Values.controller.persistence }} - apiGroups: - "" From ab83169c2d7a04d6911a8833e9949387831ba426 Mon Sep 17 00:00:00 2001 From: Pablo Osinaga Date: Thu, 30 Apr 2020 16:39:08 +0200 Subject: [PATCH 11/18] docs: Add paguos to argo workflows codeowners (#331) --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 4e0014f8..7de4e9c4 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,7 +7,7 @@ /charts/argo-events @jbehling # Argo Workflows -/charts/argo @benjaminws @stefansedich +/charts/argo @benjaminws @stefansedich @paguos # Argo Rollouts /charts/argo-rollouts @cabrinha From de30e84cf4a21b3c5a23d5f5105e77e56e9b99f8 Mon Sep 17 00:00:00 2001 From: Kristof Farkas-Pall Date: Thu, 30 Apr 2020 22:00:07 +0100 Subject: [PATCH 12/18] feat: add support for namespaced install (#263) --- .gitignore | 1 + charts/argo/Chart.yaml | 2 +- .../argo/templates/server-cluster-role.yaml | 8 +++++- charts/argo/templates/server-crb.yaml | 11 ++++++++ charts/argo/templates/server-deployment.yaml | 27 +++++++++---------- charts/argo/templates/server-sa.yaml | 2 ++ .../workflow-controller-clusterrole.yaml | 8 +++++- .../workflow-controller-config-map.yaml | 5 ++++ .../templates/workflow-controller-crb.yaml | 13 +++++++-- .../workflow-controller-deployment.yaml | 3 +++ .../templates/workflow-controller-sa.yaml | 2 ++ charts/argo/values.yaml | 12 +++++++-- 12 files changed, 72 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index f501fc92..2529e3b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ output .vscode .DS_Store +.idea **/*.tgz diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index a919ab27..df37b454 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v2.7.6" description: A Helm chart for Argo Workflows name: argo -version: 0.8.4 +version: 0.8.5 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-cluster-role.yaml b/charts/argo/templates/server-cluster-role.yaml index 193a5c7b..efb9d564 100644 --- a/charts/argo/templates/server-cluster-role.yaml +++ b/charts/argo/templates/server-cluster-role.yaml @@ -1,8 +1,14 @@ {{- if .Values.server.enabled }} apiVersion: rbac.authorization.k8s.io/v1 +{{- if .Values.singleNamespace }} +kind: Role +metadata: + name: {{ .Release.Name }}-{{ .Values.server.name }}-role +{{ else }} kind: ClusterRole metadata: - name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-role + name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-role +{{- end }} rules: - apiGroups: - "" diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml index e764b847..ed7d7982 100644 --- a/charts/argo/templates/server-crb.yaml +++ b/charts/argo/templates/server-crb.yaml @@ -1,12 +1,23 @@ {{- if .Values.server.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 +{{- if .Values.singleNamespace }} +kind: RoleBinding +metadata: + name: {{ .Release.Name }}-{{ .Values.server.name}}-rb +{{ else }} kind: ClusterRoleBinding metadata: name: {{ .Release.Name }}-{{ .Values.server.name}}-crb +{{- end }} roleRef: apiGroup: rbac.authorization.k8s.io + {{- if .Values.singleNamespace }} + kind: Role + name: {{ .Release.Name }}-{{ .Values.server.name}}-role + {{ else }} kind: ClusterRole name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-role + {{- end }} subjects: - kind: ServiceAccount name: {{ .Values.server.serviceAccount }} diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml index 1d716c35..5f5ff726 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -1,5 +1,5 @@ - -{{- if .Values.server.enabled -}}apiVersion: apps/v1 +{{- if .Values.server.enabled -}} +apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Release.Name }}-{{ .Values.server.name}} @@ -13,7 +13,6 @@ spec: matchLabels: app: {{ .Release.Name }}-{{ .Values.server.name}} release: {{ .Release.Name }} - app: {{ .Release.Name }}-{{ .Values.server.name}} template: metadata: labels: @@ -35,26 +34,24 @@ spec: {{- if .Values.server.extraArgs }} {{- toYaml .Values.server.extraArgs | nindent 10 }} {{- end }} + {{- if .Values.singleNamespace }} + - "--namespaced" + {{- end }} image: "{{ .Values.images.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}" imagePullPolicy: {{ .Values.images.pullPolicy }} {{- if .Values.server.podPortName }} ports: - name: {{ .Values.server.podPortName }} - ports: containerPort: 2746 - readinessProbe: - httpGet: - path: / - port: 2746 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 20 {{- end }} + readinessProbe: + httpGet: + path: / + port: 2746 + scheme: HTTP + initialDelaySeconds: 10 + periodSeconds: 20 env: - {{- if .Values.server.forceNamespaceIsolation }} - - name: FORCE_NAMESPACE_ISOLATION - value: "true" - {{- end }} - name: IN_CLUSTER value: "true" - name: ARGO_NAMESPACE diff --git a/charts/argo/templates/server-sa.yaml b/charts/argo/templates/server-sa.yaml index 8027811e..c0d332e1 100644 --- a/charts/argo/templates/server-sa.yaml +++ b/charts/argo/templates/server-sa.yaml @@ -3,4 +3,6 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ .Values.server.serviceAccount }} + annotations: +{{ toYaml .Values.server.serviceAccountAnnotations | indent 4 }} {{- end -}} diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml index 2511c1a3..20515321 100644 --- a/charts/argo/templates/workflow-controller-clusterrole.yaml +++ b/charts/argo/templates/workflow-controller-clusterrole.yaml @@ -1,7 +1,13 @@ apiVersion: rbac.authorization.k8s.io/v1 +{{- if .Values.singleNamespace }} +kind: Role +metadata: + name: {{ .Release.Name }}-{{ .Values.controller.name }}-role +{{ else }} kind: ClusterRole metadata: - name: {{ .Release.Name }}-{{ .Values.controller.name}}-cluster-role + name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role +{{- end }} rules: - apiGroups: - "" diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index ae73d117..068b381c 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -16,6 +16,11 @@ data: {{- end }} {{- end }} containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }} + {{- with .Values.executor.resources }} + executor: + resources: + {{- toYaml . | nindent 8 }} + {{- end }} artifactRepository: {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }} {{- if .Values.artifactRepository.archiveLogs }} diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml index 5dc55111..3eba3cf2 100644 --- a/charts/argo/templates/workflow-controller-crb.yaml +++ b/charts/argo/templates/workflow-controller-crb.yaml @@ -1,11 +1,20 @@ apiVersion: rbac.authorization.k8s.io/v1 +{{- if .Values.singleNamespace }} +kind: RoleBinding +{{ else }} kind: ClusterRoleBinding +{{- end }} metadata: - name: {{ .Release.Name }}-{{ .Values.controller.name}}-binding + name: {{ .Release.Name }}-{{ .Values.controller.name }}-binding roleRef: apiGroup: rbac.authorization.k8s.io + {{- if .Values.singleNamespace }} + kind: Role + name: {{ .Release.Name }}-{{ .Values.controller.name }}-role + {{ else }} kind: ClusterRole - name: {{ .Release.Name }}-{{ .Values.controller.name}}-cluster-role + name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-role + {{- end }} subjects: - kind: ServiceAccount name: {{ .Values.controller.serviceAccount }} diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index 06b708c6..2b8b1dbd 100644 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -40,6 +40,9 @@ spec: - "{{ .Values.controller.logging.level }}" - "--gloglevel" - "{{ .Values.controller.logging.globallevel }}" + {{- if .Values.singleNamespace }} + - "--namespaced" + {{- end }} env: - name: ARGO_NAMESPACE valueFrom: diff --git a/charts/argo/templates/workflow-controller-sa.yaml b/charts/argo/templates/workflow-controller-sa.yaml index af3ef519..02d274da 100644 --- a/charts/argo/templates/workflow-controller-sa.yaml +++ b/charts/argo/templates/workflow-controller-sa.yaml @@ -2,3 +2,5 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ .Values.controller.serviceAccount }} + annotations: +{{ toYaml .Values.controller.serviceAccountAnnotations | indent 4 }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 3bf74b3f..b1324014 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -16,6 +16,10 @@ init: createAggregateRoles: true +# Restrict Argo to only deploy into a single namespace by apply Roles and RoleBindings instead of the Cluster equivalents, +# and start argo-cli with the --namespaced flag. Use it in clusters with strict access policy. +singleNamespace: false + controller: image: # Overrides .images.tag if defined. @@ -59,6 +63,8 @@ controller: enabled: false additionalLabels: {} serviceAccount: argo + # Service account annotations + serviceAccountAnnotations: {} name: workflow-controller workflowNamespaces: - default @@ -99,15 +105,15 @@ controller: tolerations: [] affinity: {} +# executor controls how the init and wait container should be customized executor: image: # Overrides .images.tag if defined. tag: "" + resources: {} server: enabled: true - # only show workflows where UI installed - forceNamespaceIsolation: false # only updates base url of resources on client side, # it's expected that a proxy server rewrites the request URL and gets rid of this prefix # https://github.com/argoproj/argo/issues/716#issuecomment-433213190 @@ -124,6 +130,8 @@ server: servicePort: 2746 # servicePortName: http serviceAccount: argo-server + # Service account annotations + serviceAccountAnnotations: {} # Annotations to be applied to the UI Service serviceAnnotations: {} # Optional labels to add to the UI Service From 47e9523da3b202390a01f7702ee55149815b7907 Mon Sep 17 00:00:00 2001 From: Szymon <22324341+szymon3@users.noreply.github.com> Date: Mon, 4 May 2020 17:00:38 +0200 Subject: [PATCH 13/18] docs: Mention bcrypt hashing for admin password in README.md (#327) * Update README.md Mention bcrypt hashing for admin password value * Update Chart.yaml Bump patch version of chart Co-authored-by: Sean Johnson --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 700b8582..ec7fca5a 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.11 +version: 2.2.12 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 f991b464..befb1964 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -70,7 +70,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | installCRDs | Install CRDs if you are using Helm2. | `true` | | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) | | configs.secret.annotations | Annotations for argocd-secret | `{}` | -| configs.secret.argocdServerAdminPassword | Admin password | `null` | +| configs.secret.argocdServerAdminPassword | Bcrypt hashed admin password | `null` | | configs.secret.argocdServerAdminPasswordMtime | Admin password modification time | `date "2006-01-02T15:04:05Z" now` if configs.secret.argocdServerAdminPassword is set | | configs.secret.bitbucketSecret | BitBucket incoming webhook secret | `""` | | configs.secret.createSecret | Create the argocd-secret. | `true` | From b71ff243d388ce423f95f7c595121b9bb5eb9482 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 4 May 2020 20:18:56 +0100 Subject: [PATCH 14/18] feat: Allow argo-cd server service port names to be configured. (#332) * Allow server service port names to be configured. Allows to route traffic via istio to split gRPC from http * Update Chart.yaml for argo-cd * Bump Chart version to match PR orders --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 2 ++ charts/argo-cd/templates/argocd-server/service.yaml | 4 ++-- charts/argo-cd/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ec7fca5a..d1e92a9f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.12 +version: 2.2.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/argo-cd/README.md b/charts/argo-cd/README.md index befb1964..75631ebe 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -233,6 +233,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | server.service.labels | Server service labels | `{}` | | server.service.servicePortHttp | Server service http port | `80` | | server.service.servicePortHttps | Server service https port | `443` | +| server.service.servicePortHttpName | Server service http port name, can be used to route traffic via istio | `http` | +| server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` | | server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` | | server.service.type | Server service type | `"ClusterIP"` | | server.serviceAccount.create | Create server service account | `true` | diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml index 292bf94b..396b0c06 100644 --- a/charts/argo-cd/templates/argocd-server/service.yaml +++ b/charts/argo-cd/templates/argocd-server/service.yaml @@ -21,11 +21,11 @@ metadata: spec: type: {{ .Values.server.service.type }} ports: - - name: http + - name: {{ .Values.server.service.servicePortHttpName }} protocol: TCP port: {{ .Values.server.service.servicePortHttp }} targetPort: {{ .Values.server.name }} - - name: https + - name: {{ .Values.server.service.servicePortHttpsName }} protocol: TCP port: {{ .Values.server.service.servicePortHttps }} targetPort: {{ .Values.server.name }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 682a96f7..7b459a71 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -404,6 +404,8 @@ server: type: ClusterIP servicePortHttp: 80 servicePortHttps: 443 + servicePortHttpName: http + servicePortHttpsName: https loadBalancerIP: "" loadBalancerSourceRanges: [] From a334f684dac549f2925dfbec8142f1a1c58b0f55 Mon Sep 17 00:00:00 2001 From: Vignir Hafsteinsson Date: Tue, 5 May 2020 13:09:16 +0000 Subject: [PATCH 15/18] chore: Update argocd version to 1.5.3 (#334) Updating argocd version to 1.5.3 Updating documentation and default values. Bumping patch on chart version. --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 2 +- charts/argo-cd/values.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index d1e92a9f..2fcdea65 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.5.2" +appVersion: "1.5.3" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.13 +version: 2.2.14 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 75631ebe..9255e903 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -62,7 +62,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.5.2"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.5.3"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 7b459a71..80e53e3b 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.5.2 + tag: v1.5.3 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 @@ -28,7 +28,7 @@ controller: image: repository: # argoproj/argocd - tag: # v1.5.2 + tag: # v1.5.3 imagePullPolicy: # IfNotPresent ## Argo controller commandline flags @@ -319,7 +319,7 @@ server: image: repository: # argoproj/argocd - tag: # v1.5.2 + tag: # v1.5.3 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -588,7 +588,7 @@ repoServer: image: repository: # argoproj/argocd - tag: # v1.5.2 + tag: # v1.5.3 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server From a265e8f59a58c2199f79a1d5cff6149afaa494ae Mon Sep 17 00:00:00 2001 From: Spencer Gilbert Date: Tue, 5 May 2020 19:43:43 -0400 Subject: [PATCH 16/18] chore: update argocd version to 1.5.4 (#335) --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/values.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2fcdea65..addeb37b 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.5.3" +appVersion: "1.5.4" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.14 +version: 2.2.15 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 80e53e3b..832fc5db 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.5.3 + tag: v1.5.4 imagePullPolicy: IfNotPresent securityContext: {} # runAsUser: 999 @@ -28,7 +28,7 @@ controller: image: repository: # argoproj/argocd - tag: # v1.5.3 + tag: # v1.5.4 imagePullPolicy: # IfNotPresent ## Argo controller commandline flags @@ -319,7 +319,7 @@ server: image: repository: # argoproj/argocd - tag: # v1.5.3 + tag: # v1.5.4 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-server @@ -588,7 +588,7 @@ repoServer: image: repository: # argoproj/argocd - tag: # v1.5.3 + tag: # v1.5.4 imagePullPolicy: # IfNotPresent ## Additional command line arguments to pass to argocd-repo-server From e374150c3634b1f321db0e811d732580305ed068 Mon Sep 17 00:00:00 2001 From: Shabbir Kagalwala <37631063+shabbir-taulia@users.noreply.github.com> Date: Wed, 6 May 2020 12:38:49 -0600 Subject: [PATCH 17/18] Add namespaceResourceWhilelist to Projects (#336) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/projects.yaml | 4 ++++ charts/argo-cd/values.yaml | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index addeb37b..ee610c9a 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.4" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.15 +version: 2.2.16 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-server/projects.yaml b/charts/argo-cd/templates/argocd-server/projects.yaml index b48e12c2..9b086fc6 100644 --- a/charts/argo-cd/templates/argocd-server/projects.yaml +++ b/charts/argo-cd/templates/argocd-server/projects.yaml @@ -33,6 +33,10 @@ items: {{- if .namespaceResourceBlacklist }} namespaceResourceBlacklist: {{- toYaml .namespaceResourceBlacklist | nindent 8 }} + {{- end }} + {{- if .namespaceResourceWhilelist }} + namespaceResourceWhilelist: +{{- toYaml .namespaceResourceWhilelist | nindent 8 }} {{- end }} {{- if .orphanedResources }} orphanedResources: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 832fc5db..7377f958 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -555,6 +555,11 @@ server: # kind: NetworkPolicy # orphanedResources: {} # roles: [] + # namespaceResourceWhilelist: + # - group: 'apps' + # kind: Deployment + # - group: 'apps' + # kind: StatefulSet # orphanedResources: {} # roles: [] From e0a49d914d7254cd5f426134cdcffb15a471cd5f Mon Sep 17 00:00:00 2001 From: Shabbir Kagalwala <37631063+shabbir-taulia@users.noreply.github.com> Date: Thu, 7 May 2020 00:18:56 -0600 Subject: [PATCH 18/18] fix: Fix typo in namespaceResourceWhitelist (#337) * Fix typo in namespaceResourceWhitelist * chore: bumping minor version as technically a breaking change --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/projects.yaml | 6 +++--- charts/argo-cd/values.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ee610c9a..397d21b0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.4" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.16 +version: 2.3.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-server/projects.yaml b/charts/argo-cd/templates/argocd-server/projects.yaml index 9b086fc6..3f768bf0 100644 --- a/charts/argo-cd/templates/argocd-server/projects.yaml +++ b/charts/argo-cd/templates/argocd-server/projects.yaml @@ -34,9 +34,9 @@ items: namespaceResourceBlacklist: {{- toYaml .namespaceResourceBlacklist | nindent 8 }} {{- end }} - {{- if .namespaceResourceWhilelist }} - namespaceResourceWhilelist: -{{- toYaml .namespaceResourceWhilelist | nindent 8 }} + {{- if .namespaceResourceWhitelist }} + namespaceResourceWhitelist: +{{- toYaml .namespaceResourceWhitelist | nindent 8 }} {{- end }} {{- if .orphanedResources }} orphanedResources: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 7377f958..b47acbbf 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -555,7 +555,7 @@ server: # kind: NetworkPolicy # orphanedResources: {} # roles: [] - # namespaceResourceWhilelist: + # namespaceResourceWhitelist: # - group: 'apps' # kind: Deployment # - group: 'apps'