Merge pull request #860 from andyzhangx/fix-affinity-chart

fix: incorrect affinity chart config
This commit is contained in:
Andy Zhang 2025-02-10 18:20:05 +08:00 committed by GitHub
commit 2f89c5ac27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions

View File

@ -25,10 +25,10 @@ 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 }}
{{- end }} {{- end }}
{{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}} {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
affinity: affinity:

View File

@ -47,10 +47,10 @@ 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 }}
{{- end }} {{- end }}
{{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}} {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
affinity: affinity: