Skip to content

DFBUGS-2075:[release-4.19] Enabling CSI Drivers for OCS Client Operator #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Nov 25, 2025
Merged

DFBUGS-2075:[release-4.19] Enabling CSI Drivers for OCS Client Operator #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f38b2a2
api: added types for desired csi drivers in client status
rohan47 Apr 29, 2025
f4b124f
godeps: ocs-op api dependency and storageclient status api changes
rohan47 Apr 29, 2025
3adaa65
controllers: enable desired csi drivers
rohan47 Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions api/v1alpha1/storageclient_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ type StorageClientStatus struct {

// ConsumerID will hold the identity of this cluster inside the attached provider cluster
ConsumerID string `json:"id,omitempty"`

RbdDriverRequirements *RbdDriverRequirements `json:"rbdDriverRequirements,omitempty"`
CephFsDriverRequirements *CephFsDriverRequirements `json:"cephFsDriverRequirements,omitempty"`
NfsDriverRequirements *NfsDriverRequirements `json:"nfsDriverRequirements,omitempty"`
}

type RbdDriverRequirements struct {
TopologyDomainLabels []string `json:"topologyDomainLabels,omitempty"`
}

type CephFsDriverRequirements struct {
}

type NfsDriverRequirements struct {
}

//+kubebuilder:object:root=true
Expand Down
67 changes: 66 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
categories: Storage
console.openshift.io/plugins: '["odf-client-console"]'
containerImage: quay.io/ocs-dev/ocs-client-operator:latest
createdAt: "2025-08-28T08:20:40Z"
createdAt: "2025-11-25T06:16:29Z"
description: OpenShift Data Foundation client operator enables consumption of
storage services from a remote centralized OpenShift Data Foundation provider
cluster.
Expand Down
11 changes: 11 additions & 0 deletions bundle/manifests/ocs.openshift.io_storageclients.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,25 @@ spec:
status:
description: StorageClientStatus defines the observed state of StorageClient
properties:
cephFsDriverRequirements:
type: object
id:
description: ConsumerID will hold the identity of this cluster inside
the attached provider cluster
type: string
inMaintenanceMode:
type: boolean
nfsDriverRequirements:
type: object
phase:
type: string
rbdDriverRequirements:
properties:
topologyDomainLabels:
items:
type: string
type: array
type: object
type: object
type: object
served: true
Expand Down
11 changes: 11 additions & 0 deletions config/crd/bases/ocs.openshift.io_storageclients.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,25 @@ spec:
status:
description: StorageClientStatus defines the observed state of StorageClient
properties:
cephFsDriverRequirements:
type: object
id:
description: ConsumerID will hold the identity of this cluster inside
the attached provider cluster
type: string
inMaintenanceMode:
type: boolean
nfsDriverRequirements:
type: object
phase:
type: string
rbdDriverRequirements:
properties:
topologyDomainLabels:
items:
type: string
type: array
type: object
type: object
type: object
served: true
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.0
github.com/ramendr/ramen/api v0.0.0-20241105140706-d8587766acb3
github.com/red-hat-storage/ocs-client-operator/api v0.0.0-00010101000000-000000000000
github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20250924134149-df37c0839ad5
github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20251125054258-7bbeff93d115
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.70.0
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/ramendr/ramen/api v0.0.0-20241105140706-d8587766acb3 h1:q4UjNvv3jzKOeG/S+S1Ms2FV3WajBIE6266/7BIxdX4=
github.com/ramendr/ramen/api v0.0.0-20241105140706-d8587766acb3/go.mod h1:O7VpTy8MMrh31DF4fv+2SZBSouAr8NlzIY4KYx7K75U=
github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20250924134149-df37c0839ad5 h1:ElfOOOT+Qpo4GTGhy8BgkH5Ms+72S3FoZPztADWeEdE=
github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20250924134149-df37c0839ad5/go.mod h1:XGJhEtU1/Sg0mSX+hXSgzchnHq3g9Aposw5Wtf6z6vM=
github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20251125054258-7bbeff93d115 h1:o8BRDyI+/ZQQ+6hwYlWFnL2L2J4JO66YjxUVgfGqPVI=
github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20251125054258-7bbeff93d115/go.mod h1:XGJhEtU1/Sg0mSX+hXSgzchnHq3g9Aposw5Wtf6z6vM=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
Expand Down
Loading