From b88373f9f3905ca044cb3d8621e31347cb737b61 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 11 Sep 2020 11:59:44 +0530 Subject: [PATCH] ceph: dont set ownerRef when creating csidriver object currently, we are setting the rook operator as the owner on the csidriver objects, as csidriver is cluster the scoped object we should not set a namespaced object as owner on cluster scoped object. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/csi/spec.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 4e16656b2..2d7a88a2e 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -456,13 +456,13 @@ func startDrivers(clientset kubernetes.Interface, rookclientset rookclient.Inter } if EnableRBD { - err = createCSIDriverInfo(clientset, RBDDriverName, ownerRef) + err = createCSIDriverInfo(clientset, RBDDriverName) if err != nil { return errors.Wrapf(err, "failed to create CSI driver object for %q", RBDDriverName) } } if EnableCephFS { - err = createCSIDriverInfo(clientset, CephFSDriverName, ownerRef) + err = createCSIDriverInfo(clientset, CephFSDriverName) if err != nil { return errors.Wrapf(err, "failed to create CSI driver object for %q", CephFSDriverName) } @@ -542,7 +542,7 @@ func applyCephClusterNetworkConfig(objectMeta *metav1.ObjectMeta, rookclientset } // createCSIDriverInfo Registers CSI driver by creating a CSIDriver object -func createCSIDriverInfo(clientset kubernetes.Interface, name string, ownerRef *metav1.OwnerReference) error { +func createCSIDriverInfo(clientset kubernetes.Interface, name string) error { attach := true mountInfo := false // Create CSIDriver object @@ -556,7 +556,6 @@ func createCSIDriverInfo(clientset kubernetes.Interface, name string, ownerRef * }, } csidrivers := clientset.StorageV1beta1().CSIDrivers() - k8sutil.SetOwnerRef(&csiDriver.ObjectMeta, ownerRef) _, err := csidrivers.Create(csiDriver) if err == nil { logger.Infof("CSIDriver object created for driver %q", name)