Skip to content

Commit 4bbf3e6

Browse files
authored
Merge pull request #924 from andyzhangx/fix-affinity-chart
fix: incorrect affinity chart config
2 parents 3cf10b3 + 38e03c2 commit 4bbf3e6

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed
-1 Bytes
Binary file not shown.

charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ spec:
2525
{{- end }}
2626
spec:
2727
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
28-
{{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
28+
{{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
2929
{{- with .Values.controller.affinity }}
3030
affinity:
31-
{{ toYaml . | indent 8 }}
31+
{{ toYaml . | indent 8 }}
3232
{{- end }}
3333
{{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
3434
affinity:
-3 Bytes
Binary file not shown.

charts/v1.17.0/csi-driver-smb/templates/csi-smb-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ spec:
2525
{{- end }}
2626
spec:
2727
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
28-
{{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
28+
{{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
2929
{{- with .Values.controller.affinity }}
3030
affinity:
31-
{{ toYaml . | indent 8 }}
31+
{{ toYaml . | indent 8 }}
3232
{{- end }}
3333
{{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
3434
affinity:

0 commit comments

Comments
 (0)