Merge pull request #6228 from Madhu-1/fix-ownerref

ceph: remove owner reference set by rook on csidriver
This commit is contained in:
Travis Nielsen authored and GitHub committed 2020-09-18 10:09:36 -06:00
commit 02fa0eb921
4 files changed
+22 -6

No files matched your search

@@ -139,6 +139,8 @@ rules:
verbs:
- create
- delete
- get
- update
---
# Aspects of ceph-mgr that require cluster-wide access
kind: ClusterRole
@@ -996,6 +996,8 @@ rules:
verbs:
- create
- delete
- get
- update
---
# Aspects of ceph-mgr that require cluster-wide access
kind: ClusterRole
+16 -6
View File
@@ -555,14 +555,24 @@ func createCSIDriverInfo(clientset kubernetes.Interface, name string) error {
},
}
csidrivers := clientset.StorageV1beta1().CSIDrivers()
_, err := csidrivers.Create(csiDriver)
driver, err := csidrivers.Get(name, metav1.GetOptions{})
if err == nil {
logger.Infof("CSIDriver object created for driver %q", name)
return nil
// For csidriver we need to provide the resourceVersion when updating the object.
// From the docs (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata)
// > "This value MUST be treated as opaque by clients and passed unmodified back to the server"
csiDriver.ObjectMeta.ResourceVersion = driver.ObjectMeta.ResourceVersion
_, err = csidrivers.Update(csiDriver)
if err == nil {
logger.Infof("CSIDriver object updated for driver %q", name)
}
return err
}
if apierrors.IsAlreadyExists(err) {
logger.Infof("CSIDriver CRD already had been registered for %q", name)
return nil
if apierrors.IsNotFound(err) {
_, err = csidrivers.Create(csiDriver)
if err == nil {
logger.Infof("CSIDriver object created for driver %q", name)
}
}
return err
@@ -1091,6 +1091,8 @@ rules:
verbs:
- create
- delete
- get
- update
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1