starlingx
/
platform-armada-app
Code Issues Proposed changes

Fix chart syntax to comply with Go 1.14 

When testing patch [1] it was found that the usage of parenthesis on
this chart doesn't comply with the Tiller implementation on Go 1.14.
This fix will allow the upversion of Tiller to > 2.16.8 which is
required for the Armada upversioning.

[1] https://review.opendev.org/c/starlingx/ansible-playbooks/+/792297

Partial-Bug: #1928994
Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: I8532036cd70b3e20a143dceba19119779413eb39
This commit is contained in:
Thiago Brito 2021-06-01 10:47:33 -03:00 committed by Thiago Paiva Brito
parent 66fa48f04d
commit 7d30242557
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/daemonset.yaml
View File

@ -23,9 +23,9 @@ spec:
labels:
app: {{ .Values.global.name }}
spec:
{{- if (.Values.global.rbac) or (.Values.global.reuseRbac)}}
serviceAccountName: {{.Values.rbac.serviceAccount}}
{{- end}}
{{- if or .Values.global.rbac .Values.global.reuseRbac }}
serviceAccountName: {{ .Values.rbac.serviceAccount }}
{{- end }}
{{- if .Values.global.tolerations }}
tolerations:
{{ .Values.global.tolerations | toYaml | trim | indent 8 }}
@ -44,4 +44,4 @@ spec:
env:
- name: PROVISIONER_NAME
value: {{ .Values.global.provisioner_name }}
{{- end}}
{{- end }}

2
stx-platform-helm/stx-platform-helm/helm-charts/rbd-provisioner/templates/deployment.yaml
View File

@ -24,7 +24,7 @@ spec:
labels:
app: {{ .Values.global.name }}
spec:
{{- if (.Values.global.rbac) or (.Values.global.reuseRbac)}}
{{- if or .Values.global.rbac .Values.global.reuseRbac }}
serviceAccount: {{ .Values.rbac.serviceAccount }}
{{- end }}
affinity: