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

Fixing handling of serviceAccount variable inside of loops

Browse source
This commit is contained in:
Andrew Suderman 2019-11-11 10:43:12 -07:00
parent 9fcd52d292
commit e14bc20c63
No known key found for this signature in database
GPG key ID: 9C9CAE7EC2133DB7
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-events/ci/test-values.yaml Normal file
View file

@ -0,0 +1,6 @@
serviceAccount: argo-events-sa-test
additionalSaNamespaces:
- nsone
- nstwo
instanceID: test-argo-events
singleNamespace: false

3
charts/argo-events/templates/argo-events-cluster-roles.yaml
View file

@ -11,9 +11,10 @@ subjects:
name: {{ .Values.serviceAccount }} name: {{ .Values.serviceAccount }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- if .Values.additionalSaNamespaces }} {{- if .Values.additionalSaNamespaces }}
{{ $sa := .Values.serviceAccount }}
{{- range $namespace := .Values.additionalSaNamespaces }} {{- range $namespace := .Values.additionalSaNamespaces }}
- kind: ServiceAccount - kind: ServiceAccount
name: {{ .Values.serviceAccount }} name: {{ $sa }}
namespace: {{ $namespace }} namespace: {{ $namespace }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
charts/argo-events/templates/argo-events-sa.yaml
View file

@ -6,12 +6,13 @@ metadata:
name: {{ .Values.serviceAccount }} name: {{ .Values.serviceAccount }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- if .Values.additionalSaNamespaces }} {{- if .Values.additionalSaNamespaces }}
{{ $sa := .Values.serviceAccount }}
{{- range $namespace := .Values.additionalSaNamespaces }} {{- range $namespace := .Values.additionalSaNamespaces }}
--- ---
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ .Values.serviceAccount }} name: {{ $sa }}
namespace: {{ $namespace }} namespace: {{ $namespace }}
{{- end }} {{- end }}
{{- end }} {{- end }}