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

helm: Fix duplicate tolerations (backport rook#13418)
red-hat-storage · Dec 18, 2023 · 7c6a751 · 7c6a751
2 parents 8f6d9c5 + 608091d
commit 7c6a751
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/deploy/charts/rook-ceph/templates/deployment.yaml b/deploy/charts/rook-ceph/templates/deployment.yaml
@@ -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 }}