Merge pull request #13432 from rook/mergify/bp/release-1.13/pr-13418

helm: Fix duplicate tolerations (backport #13418)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2023-12-18 14:26:10 -07:00
commit 7c6a751c94
1 file changed
+3 -4
@@ -32,6 +32,9 @@ spec:
key: node.kubernetes.io/unreachable
operator: Exists
tolerationSeconds: 5
{{- if .Values.tolerations }}
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
containers:
- name: rook-ceph-operator
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -110,10 +113,6 @@ spec:
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
{{- if .Values.rbacEnable }}
serviceAccountName: rook-ceph-system
{{- end }}