diff --git a/config/crd/bases/ocs.openshift.io_storageclusterpeers.yaml b/config/crd/bases/ocs.openshift.io_storageclusterpeers.yaml index 4a7fae04f2..9425ca9bf8 100644 --- a/config/crd/bases/ocs.openshift.io_storageclusterpeers.yaml +++ b/config/crd/bases/ocs.openshift.io_storageclusterpeers.yaml @@ -150,6 +150,9 @@ spec: type: object status: description: StorageClusterPeerStatus defines the observed state of StorageClusterPeer + properties: + remoteState: + type: string type: object type: object served: true diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 9f01922b25..3586d078f7 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -71,6 +71,14 @@ rules: - cephrbdmirrors verbs: - '*' +- apiGroups: + - ceph.rook.io + resources: + - cephblockpools + verbs: + - list + - update + - watch - apiGroups: - ceph.rook.io resources: @@ -93,6 +101,15 @@ rules: - list - update - watch +- apiGroups: + - ceph.rook.io + resources: + - cephrbdmirrors + verbs: + - create + - delete + - update + - watch - apiGroups: - config.openshift.io resources: @@ -155,6 +172,15 @@ rules: - get - list - watch +- apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - update + - watch - apiGroups: - k8s.cni.cncf.io resources: diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusterpeers.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusterpeers.yaml index 4a7fae04f2..9425ca9bf8 100644 --- a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusterpeers.yaml +++ b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageclusterpeers.yaml @@ -150,6 +150,9 @@ spec: type: object status: description: StorageClusterPeerStatus defines the observed state of StorageClusterPeer + properties: + remoteState: + type: string type: object type: object served: true diff --git a/deploy/csv-templates/ocs-operator.csv.yaml.in b/deploy/csv-templates/ocs-operator.csv.yaml.in index 0be47ececd..7e7d8865f7 100644 --- a/deploy/csv-templates/ocs-operator.csv.yaml.in +++ b/deploy/csv-templates/ocs-operator.csv.yaml.in @@ -242,6 +242,14 @@ spec: - cephrbdmirrors verbs: - '*' + - apiGroups: + - ceph.rook.io + resources: + - cephblockpools + verbs: + - list + - update + - watch - apiGroups: - ceph.rook.io resources: @@ -264,6 +272,15 @@ spec: - list - update - watch + - apiGroups: + - ceph.rook.io + resources: + - cephrbdmirrors + verbs: + - create + - delete + - update + - watch - apiGroups: - config.openshift.io resources: @@ -326,6 +343,15 @@ spec: - get - list - watch + - apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - update + - watch - apiGroups: - k8s.cni.cncf.io resources: diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml index e5e3618d40..6b80b5b8cb 100644 --- a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml +++ b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml @@ -251,6 +251,14 @@ spec: - cephrbdmirrors verbs: - '*' + - apiGroups: + - ceph.rook.io + resources: + - cephblockpools + verbs: + - list + - update + - watch - apiGroups: - ceph.rook.io resources: @@ -273,6 +281,15 @@ spec: - list - update - watch + - apiGroups: + - ceph.rook.io + resources: + - cephrbdmirrors + verbs: + - create + - delete + - update + - watch - apiGroups: - config.openshift.io resources: @@ -335,6 +352,15 @@ spec: - get - list - watch + - apiGroups: + - "" + resources: + - secrets + verbs: + - create + - delete + - update + - watch - apiGroups: - k8s.cni.cncf.io resources: diff --git a/deploy/ocs-operator/manifests/storageclusterpeer.crd.yaml b/deploy/ocs-operator/manifests/storageclusterpeer.crd.yaml index 4a7fae04f2..9425ca9bf8 100644 --- a/deploy/ocs-operator/manifests/storageclusterpeer.crd.yaml +++ b/deploy/ocs-operator/manifests/storageclusterpeer.crd.yaml @@ -150,6 +150,9 @@ spec: type: object status: description: StorageClusterPeerStatus defines the observed state of StorageClusterPeer + properties: + remoteState: + type: string type: object type: object served: true diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storageclusterpeer_types.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storageclusterpeer_types.go index 0f6133e271..d2fb78364f 100644 --- a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storageclusterpeer_types.go +++ b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storageclusterpeer_types.go @@ -35,8 +35,8 @@ const ( StorageClusterPeerRemoteStateConnected StorageClusterPeerRemoteState = "Connected" // StorageClusterPeerRemoteStateOffboarding represents Onboarding state of storageClusterPeer StorageClusterPeerRemoteStateOffboarding StorageClusterPeerRemoteState = "Offboarding" - // StorageClusterPeerRemoteStateDeleting represents Deleting state of StorageClusterPeerState - StorageClusterPeerRemoteStateDeleting StorageClusterPeerRemoteState = "Deleting" + // StorageClusterPeerRemoteStateOffboarded represents Deleting state of StorageClusterPeerState + StorageClusterPeerRemoteStateOffboarded StorageClusterPeerRemoteState = "Offboarded" ) type NamespacedName struct {