PR feedback

Signed-off-by: John Kost <jkost@bandwidth.com>
This commit is contained in:
John Kost 2021-02-09 12:14:50 -05:00
parent 10d94a4981
commit c2b84c1641
2 changed files with 4 additions and 8 deletions

View file

@ -1,8 +1,8 @@
{{- if .Values.server.rbacConfigMapEnabled }} {{- if .Values.server.rbacConfigCreate }}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ .Values.server.rbacConfigMapName }} name: argocd-rbac-cm
labels: labels:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-rbac-cm app.kubernetes.io/name: {{ include "argo-cd.name" . }}-rbac-cm
helm.sh/chart: {{ include "argo-cd.chart" . }} helm.sh/chart: {{ include "argo-cd.chart" . }}
@ -20,4 +20,4 @@ metadata:
data: data:
{{- toYaml .Values.server.rbacConfig | nindent 4 }} {{- toYaml .Values.server.rbacConfig | nindent 4 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -595,13 +595,9 @@ server:
## Annotations to be added to ArgoCD rbac ConfigMap ## Annotations to be added to ArgoCD rbac ConfigMap
rbacConfigAnnotations: {} 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 # 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. # 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. ## Not well tested and not well supported on release v1.0.0.
## Applications ## Applications