From 6707d861580c9a8b0b1f9a94e9d97093669fa7b8 Mon Sep 17 00:00:00 2001 From: MaT1g3R Date: Wed, 20 May 2020 21:42:00 -0400 Subject: [PATCH 1/3] chore: spelling: kuberentes (#355) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index e1b6698e..019c4bcd 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.3.3 +version: 2.3.4 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 b47acbbf..45d20995 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -160,7 +160,7 @@ controller: # additionalLabels: {} ## Enable Admin ClusterRole resources. - ## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster. + ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster. clusterAdminAccess: enabled: true @@ -564,7 +564,7 @@ server: # roles: [] ## Enable Admin ClusterRole resources. - ## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster. + ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster. clusterAdminAccess: enabled: true From bcc861a904d2e126e60b1ddbc73f9d47ce801065 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Mon, 25 May 2020 21:48:35 +0200 Subject: [PATCH 2/3] fix: take argocd SA flags into account (#358) --- charts/argo-cd/Chart.yaml | 2 +- .../argocd-application-controller/serviceaccount.yaml | 4 +++- charts/argo-cd/templates/argocd-server/serviceaccount.yaml | 4 +++- charts/argo-cd/templates/dex/serviceaccount.yaml | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 019c4bcd..b34759a5 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.3.4 +version: 2.3.5 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-application-controller/serviceaccount.yaml b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml index b397d43c..fbbb0b78 100644 --- a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml @@ -1,3 +1,4 @@ +{{- if .Values.controller.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: @@ -8,4 +9,5 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: argocd - app.kubernetes.io/component: {{ .Values.controller.name }} \ No newline at end of file + app.kubernetes.io/component: {{ .Values.controller.name }} +{{- end }} diff --git a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml index 08f11d01..b8549600 100644 --- a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml @@ -1,3 +1,4 @@ +{{- if .Values.server.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: @@ -8,4 +9,5 @@ metadata: 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 }} \ No newline at end of file + app.kubernetes.io/component: {{ .Values.server.name }} +{{- end }} diff --git a/charts/argo-cd/templates/dex/serviceaccount.yaml b/charts/argo-cd/templates/dex/serviceaccount.yaml index 4df9ca5a..cdd1cd0b 100644 --- a/charts/argo-cd/templates/dex/serviceaccount.yaml +++ b/charts/argo-cd/templates/dex/serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if .Values.dex.enabled }} +{{- if .Values.dex.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: @@ -10,4 +10,4 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.dex.name }} -{{- end }} \ No newline at end of file +{{- end }} From 3d94a95f5af8e405514158426649f47439e4da45 Mon Sep 17 00:00:00 2001 From: Tom Firth Date: Wed, 27 May 2020 16:01:15 +0100 Subject: [PATCH 3/3] docs: Add archive option to values.yaml to clarify persistence options (#359) --- charts/argo/Chart.yaml | 2 +- charts/argo/values.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 154cfc01..c75eaaf1 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.8.0 description: A Helm chart for Argo Workflows name: argo -version: 0.9.3 +version: 0.9.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/values.yaml b/charts/argo/values.yaml index 7f0eead3..8f8e825d 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -39,6 +39,8 @@ controller: # maxOpenConns: 0 # # save the entire workflow into etcd and DB # nodeStatusOffLoad: false + # # enable archiving of old workflows + # archive: false # postgresql: # host: localhost # port: 5432