From a1024ebc75f9c82a6874d6353c344a48f10e460e Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 10 Sep 2020 14:57:10 +0530 Subject: [PATCH] ceph: remove owner reference set by rook on csidriver currently, we are setting the rook operator as owner on the csidriver objects, as csidriver is cluster scoped object we should not set namespaced object as owner on cluster scoped object fixes #6162 Signed-off-by: Madhu Rajanna --- .../rook-ceph/templates/clusterrole.yaml | 2 ++ cluster/examples/kubernetes/ceph/common.yaml | 2 ++ pkg/operator/ceph/csi/spec.go | 22 ++++++++++++++----- tests/framework/installer/ceph_manifests.go | 2 ++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cluster/charts/rook-ceph/templates/clusterrole.yaml b/cluster/charts/rook-ceph/templates/clusterrole.yaml index e0cf3920e..43e6cc8d3 100644 --- a/cluster/charts/rook-ceph/templates/clusterrole.yaml +++ b/cluster/charts/rook-ceph/templates/clusterrole.yaml @@ -139,6 +139,8 @@ rules: verbs: - create - delete + - get + - update --- # Aspects of ceph-mgr that require cluster-wide access kind: ClusterRole diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 738f52355..2434cdb21 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -983,6 +983,8 @@ rules: verbs: - create - delete + - get + - update --- # Aspects of ceph-mgr that require cluster-wide access kind: ClusterRole diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 2d7a88a2e..a85d28825 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -556,14 +556,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 diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 70d179aee..49ad3aea3 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -973,6 +973,8 @@ rules: verbs: - create - delete + - get + - update --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1