rebase: update external-snapshotter client to v7

updating external-snapshotter client to use the latest release updates ceph#4435 Signed-off-by: Madhu Rajanna <[email protected]>
Madhu-1 · Feb 19, 2024 · 9a06123 · 9a06123
1 parent 0a82f17
commit 9a06123
Show file tree

Hide file tree

Showing 26 changed files with 99 additions and 56 deletions.
diff --git a/e2e/cephfs.go b/e2e/cephfs.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"sync"
 
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	. "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

diff --git a/e2e/cephfs_helper.go b/e2e/cephfs_helper.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/e2e/nfs.go b/e2e/nfs.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	. "github.com/onsi/ginkgo/v2" //nolint:golint // e2e uses By() and other Ginkgo functions
 	v1 "k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"

diff --git a/e2e/rbd_helper.go b/e2e/rbd_helper.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/ceph/ceph-csi/internal/util"
 
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	v1 "k8s.io/api/core/v1"
 	scv1 "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/e2e/snapshot.go b/e2e/snapshot.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
-	snapclient "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/typed/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
+	snapclient "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/typed/volumesnapshot/v1"
 	. "github.com/onsi/gomega" //nolint:golint // e2e uses Expect() and other Gomega functions
 	v1 "k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"

diff --git a/e2e/utils.go b/e2e/utils.go
@@ -30,7 +30,7 @@ import (
 	"sync"
 	"time"
 
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	batch "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"

diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/hashicorp/vault/api v1.12.0
 	github.com/kubernetes-csi/csi-lib-utils v0.17.0
-	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
+	github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0
 	github.com/libopenstorage/secrets v0.0.0-20231011182615-5f4b25ceede1
 	github.com/onsi/ginkgo/v2 v2.15.0
 	github.com/onsi/gomega v1.31.1

diff --git a/go.sum b/go.sum
@@ -1319,8 +1319,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kubernetes-csi/csi-lib-utils v0.17.0 h1:xEpJ3WYgMyyYF6fvcKHh4cDRtknuTkBS9rG8bYoLTCU=
 github.com/kubernetes-csi/csi-lib-utils v0.17.0/go.mod h1:2Ba5/aQgUjbpqyC2uCcFwMF3rnPVs5jhZXm8jAzcT9Q=
 github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
-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/v7 v7.0.0 h1:j3YK74myEQRxR/srciTpOrm221SAvz6J5OVWbyfeXFo=
+github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0/go.mod h1:FlyYFe32mPxKEPaRXKNxfX576d1AoCzstYDoOOnyMA4=
 github.com/libopenstorage/autopilot-api v0.6.1-0.20210128210103-5fbb67948648/go.mod h1:6JLrPbR3ZJQFbUY/+QJMl/aF00YdIrLf8/GWAplgvJs=
 github.com/libopenstorage/openstorage v8.0.0+incompatible/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
 github.com/libopenstorage/operator v0.0.0-20200725001727-48d03e197117/go.mod h1:Qh+VXOB6hj60VmlgsmY+R1w+dFuHK246UueM4SAqZG0=

diff --git a/...si/external-snapshotter/client/v6/LICENSE → ...si/external-snapshotter/client/v7/LICENSE b/...si/external-snapshotter/client/v6/LICENSE → ...si/external-snapshotter/client/v7/LICENSE
diff --git a/.../apis/volumegroupsnapshot/v1alpha1/doc.go → .../apis/volumegroupsnapshot/v1alpha1/doc.go b/.../apis/volumegroupsnapshot/v1alpha1/doc.go → .../apis/volumegroupsnapshot/v1alpha1/doc.go
diff --git a/.../volumegroupsnapshot/v1alpha1/register.go → .../volumegroupsnapshot/v1alpha1/register.go b/.../volumegroupsnapshot/v1alpha1/register.go → .../volumegroupsnapshot/v1alpha1/register.go
diff --git a/...pis/volumegroupsnapshot/v1alpha1/types.go → ...pis/volumegroupsnapshot/v1alpha1/types.go b/...pis/volumegroupsnapshot/v1alpha1/types.go → ...pis/volumegroupsnapshot/v1alpha1/types.go
diff --git a/...napshot/v1alpha1/zz_generated.deepcopy.go → ...napshot/v1alpha1/zz_generated.deepcopy.go b/...napshot/v1alpha1/zz_generated.deepcopy.go → ...napshot/v1alpha1/zz_generated.deepcopy.go
diff --git a/...r/client/v6/apis/volumesnapshot/v1/doc.go → ...r/client/v7/apis/volumesnapshot/v1/doc.go b/...r/client/v6/apis/volumesnapshot/v1/doc.go → ...r/client/v7/apis/volumesnapshot/v1/doc.go
diff --git a/...ent/v6/apis/volumesnapshot/v1/register.go → ...ent/v7/apis/volumesnapshot/v1/register.go b/...ent/v6/apis/volumesnapshot/v1/register.go → ...ent/v7/apis/volumesnapshot/v1/register.go
diff --git a/...client/v6/apis/volumesnapshot/v1/types.go → ...client/v7/apis/volumesnapshot/v1/types.go b/...client/v6/apis/volumesnapshot/v1/types.go → ...client/v7/apis/volumesnapshot/v1/types.go
diff --git a/...olumesnapshot/v1/zz_generated.deepcopy.go → ...olumesnapshot/v1/zz_generated.deepcopy.go b/...olumesnapshot/v1/zz_generated.deepcopy.go → ...olumesnapshot/v1/zz_generated.deepcopy.go
diff --git a/...ient/v6/clientset/versioned/scheme/doc.go → ...ient/v7/clientset/versioned/scheme/doc.go b/...ient/v6/clientset/versioned/scheme/doc.go → ...ient/v7/clientset/versioned/scheme/doc.go
diff --git a/...v6/clientset/versioned/scheme/register.go → ...v7/clientset/versioned/scheme/register.go b/...v6/clientset/versioned/scheme/register.go → ...v7/clientset/versioned/scheme/register.go
diff --git a/.../versioned/typed/volumesnapshot/v1/doc.go → .../versioned/typed/volumesnapshot/v1/doc.go b/.../versioned/typed/volumesnapshot/v1/doc.go → .../versioned/typed/volumesnapshot/v1/doc.go
diff --git a/.../volumesnapshot/v1/generated_expansion.go → .../volumesnapshot/v1/generated_expansion.go b/.../volumesnapshot/v1/generated_expansion.go → .../volumesnapshot/v1/generated_expansion.go
diff --git a/...typed/volumesnapshot/v1/volumesnapshot.go → ...typed/volumesnapshot/v1/volumesnapshot.go b/...typed/volumesnapshot/v1/volumesnapshot.go → ...typed/volumesnapshot/v1/volumesnapshot.go
diff --git a/...olumesnapshot/v1/volumesnapshot_client.go → ...olumesnapshot/v1/volumesnapshot_client.go b/...olumesnapshot/v1/volumesnapshot_client.go → ...olumesnapshot/v1/volumesnapshot_client.go
diff --git a/.../volumesnapshot/v1/volumesnapshotclass.go → .../volumesnapshot/v1/volumesnapshotclass.go b/.../volumesnapshot/v1/volumesnapshotclass.go → .../volumesnapshot/v1/volumesnapshotclass.go
diff --git a/...olumesnapshot/v1/volumesnapshotcontent.go → ...olumesnapshot/v1/volumesnapshotcontent.go b/...olumesnapshot/v1/volumesnapshotcontent.go → ...olumesnapshot/v1/volumesnapshotcontent.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -395,12 +395,12 @@ github.com/kubernetes-csi/csi-lib-utils/connection
 github.com/kubernetes-csi/csi-lib-utils/metrics
 github.com/kubernetes-csi/csi-lib-utils/protosanitizer
 github.com/kubernetes-csi/csi-lib-utils/rpc
-# github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
-## explicit; go 1.20
-github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumegroupsnapshot/v1alpha1
-github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1
-github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/scheme
-github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/typed/volumesnapshot/v1
+# github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0
+## explicit; go 1.21
+github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumegroupsnapshot/v1alpha1
+github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1
+github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/scheme
+github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/typed/volumesnapshot/v1
 # github.com/libopenstorage/secrets v0.0.0-20231011182615-5f4b25ceede1
 ## explicit; go 1.13
 github.com/libopenstorage/secrets