ceph: fix csi blocker owner deletion
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 <seb@redhat.com>
This commit is contained in:
1 parent
67c669f183
commit
461dcd7457
1 file changed
+7
-2
@@ -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
|
||||
|
||||
Reference in new issue
Block a user