godeps: upgrade go, cr, cg for k8s-csi

Signed-off-by: raaizik <[email protected]>

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-10-07T10:43:06Z"
+    createdAt: "2024-10-08T14:44:01Z"
     description: OpenShift Data Foundation client operator enables consumption of
       storage services from a remote centralized OpenShift Data Foundation provider
       cluster.
@@ -175,22 +175,6 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - groupsnapshot.storage.k8s.io
-          resources:
-          - volumegroupsnapshotclasses
-          verbs:
-          - get
-          - list
-          - watch
-        - apiGroups:
-          - groupsnapshot.storage.k8s.io
-          resources:
-          - volumegroupsnapshotcontents
-          verbs:
-          - get
-          - list
-          - watch
         - apiGroups:
           - csi.ceph.io
           resources:
@@ -207,12 +191,11 @@ spec:
           resources:
           - clientprofiles
           verbs:
+          - ;delete
           - create
-          - delete
           - get
           - list
           - update
-          - watch
         - apiGroups:
           - csi.ceph.io
           resources:
@@ -235,6 +218,21 @@ spec:
           - list
           - update
           - watch
+        - apiGroups:
+          - groupsnapshot.storage.k8s.io
+          resources:
+          - volumegroupsnapshotclasses
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - groupsnapshot.storage.k8s.io
+          resources:
+          - volumegroupsnapshotcontents
+          verbs:
+          - get
+          - list
         - apiGroups:
           - monitoring.coreos.com
           resources:
@@ -371,7 +369,6 @@ spec:
           verbs:
           - get
           - list
-          - watch
         - apiGroups:
           - storage.k8s.io
           resources:

cmd/main.go

@@ -31,7 +31,7 @@ import (
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	csiopv1a1 "github.com/ceph/ceph-csi-operator/api/v1alpha1"
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
 	nbapis "github.com/noobaa/noobaa-operator/v5/pkg/apis"
 	configv1 "github.com/openshift/api/config/v1"
 	consolev1 "github.com/openshift/api/console/v1"

config/rbac/role.yaml

@@ -132,22 +132,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - csi.ceph.io
   resources:
@@ -164,12 +148,11 @@ rules:
   resources:
   - clientprofiles
   verbs:
+  - ;delete
   - create
-  - delete
   - get
   - list
   - update
-  - watch
 - apiGroups:
   - csi.ceph.io
   resources:
@@ -192,6 +175,21 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - groupsnapshot.storage.k8s.io
+  resources:
+  - volumegroupsnapshotclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - groupsnapshot.storage.k8s.io
+  resources:
+  - volumegroupsnapshotcontents
+  verbs:
+  - get
+  - list
 - apiGroups:
   - monitoring.coreos.com
   resources:
@@ -328,7 +326,6 @@ rules:
   verbs:
   - get
   - list
-  - watch
 - apiGroups:
   - storage.k8s.io
   resources:

go.mod

@@ -20,7 +20,7 @@ exclude (
 require (
 	github.com/ceph/ceph-csi-operator/api v0.0.0-20240812072523-4d50cf3a32a0
 	github.com/go-logr/logr v1.4.2
-	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
+	github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.34.1
 	github.com/openshift/api v0.0.0-20240828125535-01b3675ba7b3

go.sum

@@ -254,8 +254,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1 h1:dQEHhTfi+bSIOSViQrKY9PqJvZenD6tFz+3lPzux58o=
 github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1/go.mod h1:my+EVjOJLeQ9lUR9uVkxRvNNkhO2saSGIgzV8GZT9HY=
-github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0 h1:qS4r4ljINLWKJ9m9Ge3Q3sGZ/eIoDVDT2RhAdQFHb1k=
-github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0/go.mod h1:oGXx2XTEzs9ikW2V6IC1dD8trgjRsS/Mvc2JRiC618Y=
+github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0 h1:mjQG0Vakr2h246kEDR85U8y8ZhPgT3bguTCajRa/jaw=
+github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0/go.mod h1:E3vdYxHj2C2q6qo8/Da4g7P+IcwqRZyy3gJBzYybV9Y=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

internal/controller/storageclaim_controller.go

@@ -37,7 +37,7 @@ import (
 	groupsnapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1alpha1"
 	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
 	ramenv1alpha1 "github.com/ramendr/ramen/api/v1alpha1"
-	providerclient "github.com/red-hat-storage/ocs-operator/v4/services/provider/client"
+	providerclient "github.com/red-hat-storage/ocs-operator/services/provider/api/v4/client"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -79,7 +79,6 @@ type StorageClaimReconciler struct {
 	storageClient    *v1alpha1.StorageClient
 	storageClaim     *v1alpha1.StorageClaim
 	storageClaimHash string
-	AvailableCrds    map[string]bool
 }
 
 // SetupWithManager sets up the controller with the Manager.