From 608091ddf76288f26a636fa2e5fa3fb1ae5718a2 Mon Sep 17 00:00:00 2001
From: Julien Francoz <julien-github@francoz.net>
Date: Sun, 17 Dec 2023 21:44:04 +0000
Subject: [PATCH] helm: fix duplicate tolerations

Fix duplicates tolerations in operator Deployment

Resolves https://github.com/rook/rook/issues/13416

Signed-off-by: Julien Francoz <julien-github@francoz.net>
(cherry picked from commit 1171b60862534c6e7b6dcb953c733ade7af2df37)
---
 deploy/charts/rook-ceph/templates/deployment.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/deploy/charts/rook-ceph/templates/deployment.yaml b/deploy/charts/rook-ceph/templates/deployment.yaml
index e7feeb64b..a0d2be74f 100644
--- 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 }}