From c2b84c164103b39513062ed07cc0a76587275213 Mon Sep 17 00:00:00 2001 From: John Kost Date: Tue, 9 Feb 2021 12:14:50 -0500 Subject: [PATCH] PR feedback Signed-off-by: John Kost --- charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml | 6 +++--- charts/argo-cd/values.yaml | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) 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 8f00a09a..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,8 +1,8 @@ -{{- if .Values.server.rbacConfigMapEnabled }} +{{- if .Values.server.rbacConfigCreate }} apiVersion: v1 kind: ConfigMap metadata: - name: {{ .Values.server.rbacConfigMapName }} + name: argocd-rbac-cm labels: app.kubernetes.io/name: {{ include "argo-cd.name" . }}-rbac-cm helm.sh/chart: {{ include "argo-cd.chart" . }} @@ -20,4 +20,4 @@ metadata: data: {{- toYaml .Values.server.rbacConfig | nindent 4 }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 857b522f..8ec409e9 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -595,13 +595,9 @@ server: ## Annotations to be added to ArgoCD rbac ConfigMap rbacConfigAnnotations: {} - # Name of the configmap used for the RBAC config. Must be set to `argocd-rbac-cm` as the values are hardcoded in - # ArgoCD. See https://github.com/argoproj/argo-cd/blob/master/common/common.go - rbacConfigMapName: "argocd-rbac-cm" - # 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. - rbacConfigMapEnabled: true + rbacConfigCreate: true ## Not well tested and not well supported on release v1.0.0. ## Applications