From 461dcd7457cb47fe51156d036068ff29f835b2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 18 Mar 2021 09:48:52 +0100 Subject: [PATCH] ceph: fix csi blocker owner deletion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Small regression introduced in https://github.com/rook/rook/commit/26c8fd9bd14178d74dcc28f009e5c2f658224436 which was overriding the BlockOwnerDeletion from the ownerref. Now, if set we don't modify it. This fixes deployments on OCP. Signed-off-by: Sébastien Han --- pkg/operator/k8sutil/resources.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/operator/k8sutil/resources.go b/pkg/operator/k8sutil/resources.go index 54ec2ab53..5ceef5e2e 100644 --- a/pkg/operator/k8sutil/resources.go +++ b/pkg/operator/k8sutil/resources.go @@ -99,9 +99,14 @@ func (info *OwnerInfo) SetControllerReference(object metav1.Object) error { if err != nil { return err } - blockOwnerDeletion := true + + // Do not override the BlockOwnerDeletion is already set + if info.ownerRef.BlockOwnerDeletion == nil { + blockOwnerDeletion := true + info.ownerRef.BlockOwnerDeletion = &blockOwnerDeletion + } + controller := true - info.ownerRef.BlockOwnerDeletion = &blockOwnerDeletion info.ownerRef.Controller = &controller SetOwnerRef(object, info.ownerRef) return nil