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

Syncing latest changes from main for ocs-client-operator

Author: openshift-merge-bot[bot]

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

@@ -7,7 +7,7 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-client-console"]'
     containerImage: quay.io/ocs-dev/ocs-client-operator:latest
-    createdAt: "2024-11-14T15:13:37Z"
+    createdAt: "2024-11-18T12:48:54Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.
@@ -164,6 +164,17 @@ spec:
           - list
           - update
           - watch
+        - apiGroups:
+          - csi.ceph.io
+          resources:
+          - clientprofilemappings
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - update
+          - watch
         - apiGroups:
           - csi.ceph.io
           resources:

config/rbac/role.yaml

@@ -121,6 +121,17 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - csi.ceph.io
+  resources:
+  - clientprofilemappings
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - csi.ceph.io
   resources:

go.mod

@@ -18,7 +18,7 @@ exclude (
 )
 
 require (
-	github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0
+	github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3
 	github.com/go-logr/logr v1.4.2
 	github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
 	github.com/onsi/ginkgo v1.16.5

go.sum

@@ -54,8 +54,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0 h1:LIAWGeOu1JzrhknCyD0JbuCUuCuhfiY/H+cBz4nsUcg=
-github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0/go.mod h1:odEUoarG26wXBCC2l4O4nMWhAz6VTKr2FRkv9yELgi8=
+github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3 h1:ft8h5V7BfQqIGJAyiTvn6x86Oi/yMs8yqW7rfKvN9SQ=
+github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3/go.mod h1:odEUoarG26wXBCC2l4O4nMWhAz6VTKr2FRkv9yELgi8=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=

internal/controller/storageclient_controller.go

@@ -103,7 +103,8 @@ func (r *StorageClientReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&quotav1.ClusterResourceQuota{}, builder.WithPredicates(generationChangePredicate)).
 		Owns(&nbv1.NooBaa{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Owns(&corev1.Secret{}).
-		Owns(&csiopv1a1.CephConnection{}, builder.WithPredicates(generationChangePredicate))
+		Owns(&csiopv1a1.CephConnection{}, builder.WithPredicates(generationChangePredicate)).
+		Owns(&csiopv1a1.ClientProfileMapping{}, builder.WithPredicates(generationChangePredicate))
 
 	return bldr.Complete(r)
 }
@@ -118,6 +119,7 @@ func (r *StorageClientReconciler) SetupWithManager(mgr ctrl.Manager) error {
 //+kubebuilder:rbac:groups=csi.ceph.io,resources=cephconnections,verbs=get;list;update;create;watch;delete
 //+kubebuilder:rbac:groups=noobaa.io,resources=noobaas,verbs=get;list;watch;create;update;delete
 //+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;delete
+//+kubebuilder:rbac:groups=csi.ceph.io,resources=clientprofilemappings,verbs=get;list;update;create;watch;delete
 
 func (r *StorageClientReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	var err error
@@ -235,6 +237,21 @@ func (r *StorageClientReconciler) reconcilePhases() (ctrl.Result, error) {
 			}); err != nil {
 				return reconcile.Result{}, fmt.Errorf("failed to reconcile cephConnection: %v", err)
 			}
+		case "ClientProfileMapping":
+			clientProfileMapping := &csiopv1a1.ClientProfileMapping{}
+			clientProfileMapping.Name = eResource.Name
+			clientProfileMapping.Namespace = r.OperatorNamespace
+			if _, err := controllerutil.CreateOrUpdate(r.ctx, r.Client, clientProfileMapping, func() error {
+				if err := r.own(clientProfileMapping); err != nil {
+					return fmt.Errorf("failed to own clientProfileMapping resource: %v", err)
+				}
+				if err := json.Unmarshal(eResource.Data, &clientProfileMapping.Spec); err != nil {
+					return fmt.Errorf("failed to unmarshall clientProfileMapping spec: %v", err)
+				}
+				return nil
+			}); err != nil {
+				return reconcile.Result{}, fmt.Errorf("failed to reconcile clientProfileMapping: %v", err)
+			}
 		case "Secret":
 			data := map[string]string{}
 			if err := json.Unmarshal(eResource.Data, &data); err != nil {

vendor/github.com/ceph/ceph-csi-operator/api/v1alpha1/clientprofilemapping_types.go

@@ -4,7 +4,7 @@ github.com/beorn7/perks/quantile
 # github.com/blang/semver/v4 v4.0.0
 ## explicit; go 1.14
 github.com/blang/semver/v4
-# github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0
+# github.com/ceph/ceph-csi-operator/api v0.0.0-20241114115439-f325f74205d3
 ## explicit; go 1.22.0
 github.com/ceph/ceph-csi-operator/api/v1alpha1
 # github.com/cespare/xxhash/v2 v2.3.0