Merge pull request #860 from andyzhangx/fix-affinity-chart
fix: incorrect affinity chart config
This commit is contained in:
commit
2f89c5ac27
Binary file not shown.
@ -25,7 +25,7 @@ spec:
|
|||||||
dnsPolicy: {{ .Values.controller.dnsPolicy }}
|
dnsPolicy: {{ .Values.controller.dnsPolicy }}
|
||||||
serviceAccountName: {{ .Values.serviceAccount.controller }}
|
serviceAccountName: {{ .Values.serviceAccount.controller }}
|
||||||
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
|
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
|
||||||
{{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
|
{{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
|
||||||
{{- with .Values.controller.affinity }}
|
{{- with .Values.controller.affinity }}
|
||||||
affinity:
|
affinity:
|
||||||
{{ toYaml . | indent 8 }}
|
{{ toYaml . | indent 8 }}
|
||||||
|
|||||||
@ -47,7 +47,7 @@ spec:
|
|||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
|
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
|
||||||
{{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
|
{{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
|
||||||
{{- with .Values.controller.affinity }}
|
{{- with .Values.controller.affinity }}
|
||||||
affinity:
|
affinity:
|
||||||
{{ toYaml . | indent 8 }}
|
{{ toYaml . | indent 8 }}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user