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 5158366ca..ad7ed91a5 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -996,6 +996,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 7d06b515d..b9c86effe 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -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 diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 0f17df1e2..3203f3f24 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -1091,6 +1091,8 @@ rules: verbs: - create - delete + - get + - update --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1