DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-use controller.workflowNamespaces instead of introducing workflow.namespaces

Browse source 
Signed-off-by: reinvantveer <rein.van.t.veer@geodan.nl>
This commit is contained in:
reinvantveer 2021-07-12 13:56:09 +02:00
parent 41c6be74c4
commit 1a60f03610
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
charts/argo-workflows/templates/controller/workflow-sa.yaml
View file

@ -12,21 +12,21 @@ metadata:
This type check is done only once, here. It would be overkill to perform it for other RBAC resources as well. This type check is done only once, here. It would be overkill to perform it for other RBAC resources as well.
*/}} */}}
{{- if and .Values.workflow.namespaces .Values.workflow.namespace }} {{- if and .Values.controller.workflowNamespaces .Values.workflow.namespace }}
{{- fail "Please set either workflow.namespaces or workflow.namespace for the service account, not both" }} {{- fail "Please set either controller.workflowNamespaces or workflow.namespace for the service account, not both" }}
{{- end }} {{- end }}
{{- if .Values.workflow.namespaces }} {{- if .Values.controller.workflowNamespaces }}
{{- /* {{- /*
Type-check the namespaces variable for being a list ("slice") Type-check the namespaces variable for being a list ("slice")
This type check is done only once, here. It would be overkill to perform it for other RBAC resources as well. This type check is done only once, here. It would be overkill to perform it for other RBAC resources as well.
*/}} */}}
{{- if not ( kindIs "slice" .Values.workflow.namespaces ) }} {{- if not ( kindIs "slice" .Values.controller.workflowNamespaces ) }}
{{- fail ( printf "workflow.namespaces is a slice, got %s %s" ( kindOf .Values.workflow.namespaces ) .Values.workflow.namespaces ) }} {{- fail ( printf "workflow.namespaces is a slice, got %s %s" ( kindOf .Values.controller.workflowNamespaces ) .Values.controller.workflowNamespaces ) }}
{{- end }} {{- end }}
{{ $namespaces := .Values.workflow.namespaces }} {{ $namespaces := .Values.controller.workflowNamespaces }}
{{- range $namespaces }} {{- range $namespaces }}
{{ $namespace := . }} {{ $namespace := . }}
{{ include "sa-base" . }} {{ include "sa-base" . }}