openstack/openstack-helm
Code Issues Proposed changes

Merge "RBAC: Fix issue with inclusion of empty jobs or daemonsets"

Browse Source
This commit is contained in:
Zuul 2017-12-29 15:34:02 +00:00 committed by Gerrit Code Review
commit 16dcedffb5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
View File

@ -36,9 +36,9 @@ metadata:
{{- $_ := set $allNamespace $endpointNS (printf "%s%s" "services," ((index $allNamespace $endpointNS) | default "")) }} {{- $_ := set $allNamespace $endpointNS (printf "%s%s" "services," ((index $allNamespace $endpointNS) | default "")) }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- else if eq $k "jobs" }} {{- else if and (eq $k "jobs") $v }}
{{- $_ := set $allNamespace $saNamespace (printf "%s%s" "jobs," ((index $allNamespace $saNamespace) | default "")) }} {{- $_ := set $allNamespace $saNamespace (printf "%s%s" "jobs," ((index $allNamespace $saNamespace) | default "")) }}
{{- else if eq $k "daemonset" }} {{- else if and (eq $k "daemonset") $v }}
{{- $_ := set $allNamespace $saNamespace (printf "%s%s" "daemonsets," ((index $allNamespace $saNamespace) | default "")) }} {{- $_ := set $allNamespace $saNamespace (printf "%s%s" "daemonsets," ((index $allNamespace $saNamespace) | default "")) }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}