feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #6232 from Madhu-1/csidriv-ownerref

Browse Source 
ceph: dont set ownerRef when creating csidriver object
This commit is contained in:
Travis Nielsen authored and GitHub committed 2020-09-11 07:05:59 -06:00
2 parents 6998d00740 b88373f9f3
commit b93fcbe208
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/csi/spec.go
+3 -4
View File
@@ -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)