Merge pull request #486 from red-hat-storage/sync_ds--main

Syncing latest changes from main for ocs-client-operator

Author: openshift-merge-bot[bot]

api/v1alpha1/storageclient_types.go

@@ -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

api/v1alpha1/zz_generated.deepcopy.go

@@ -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-10-07T06:45:45Z"
+    createdAt: "2025-10-09T11:48:09Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.

bundle/manifests/ocs-client-operator.clusterserviceversion.yaml

@@ -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

bundle/manifests/ocs.openshift.io_storageclients.yaml

@@ -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

config/crd/bases/ocs.openshift.io_storageclients.yaml

@@ -34,9 +34,9 @@ require (
 	github.com/ramendr/ramen/api v0.0.0-20241105140706-d8587766acb3
 	github.com/red-hat-storage/external-snapshotter/client/v8 v8.2.1-0.20250611085013-4bd0abb96745
 	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-20250902083935-29606f2cd7f6
+	github.com/red-hat-storage/ocs-operator/services/provider/api/v4 v4.0.0-20251009102644-5727239a7b48
 	github.com/stretchr/testify v1.10.0
-	google.golang.org/grpc v1.74.2
+	google.golang.org/grpc v1.76.0
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.1
 	k8s.io/apimachinery v0.33.3
@@ -64,15 +64,15 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.36.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
-	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
-	golang.org/x/sync v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	k8s.io/apiserver v0.33.1 // indirect
 	k8s.io/component-base v0.33.1 // indirect
@@ -116,15 +116,15 @@ require (
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
-	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/term v0.36.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
-	google.golang.org/protobuf v1.36.7 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect