WIP: Update to snapshot v3client

kubernetes-csi · Nov 17, 2020 · 3335eee · 3335eee
1 parent 22e193a
commit 3335eee
Show file tree

Hide file tree

Showing 29 changed files with 2,006 additions and 15 deletions.
diff --git a/cmd/csi-provisioner/csi-provisioner.go b/cmd/csi-provisioner/csi-provisioner.go
@@ -48,7 +48,7 @@ import (
 	"github.com/kubernetes-csi/external-provisioner/pkg/capacity/topology"
 	ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
 	"github.com/kubernetes-csi/external-provisioner/pkg/owner"
-	snapclientset "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned"
+	snapclientset "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/kubernetes-csi/csi-lib-utils v0.8.1
 	github.com/kubernetes-csi/csi-test/v3 v3.1.1
 	github.com/kubernetes-csi/external-snapshotter/client/v2 v2.2.0-rc3
+	github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0
 	github.com/spf13/pflag v1.0.5
 	google.golang.org/grpc v1.29.1
 	k8s.io/api v0.19.3

diff --git a/go.sum b/go.sum
@@ -365,6 +365,8 @@ github.com/kubernetes-csi/csi-test/v3 v3.1.1 h1:mFxPbUf7pti663WTCsfaT3YRPVIzy0yL
 github.com/kubernetes-csi/csi-test/v3 v3.1.1/go.mod h1:UWxYP5cDlD6iSNVKEiLFqfJnJinuhtI7MLt61rQQOfI=
 github.com/kubernetes-csi/external-snapshotter/client/v2 v2.2.0-rc3 h1://kqMNFTDX6gD13dbDfIKepSasiPbGMPw+kT90kxV2Y=
 github.com/kubernetes-csi/external-snapshotter/client/v2 v2.2.0-rc3/go.mod h1:speZ9Q5gEevndGNLFUKXCfNYZ9s8BBapHAfPGryOxKE=
+github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0 h1:OYDCOjVcx/5wNzlZ/At8otRibUlw0T6R0xOD31f32bw=
+github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0/go.mod h1:Q7VUue/CIrKbtpBdF04a1yjGGgsMaDws1HUxtjzgnEY=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -51,8 +51,8 @@ import (
 	"github.com/kubernetes-csi/csi-lib-utils/connection"
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	"github.com/kubernetes-csi/csi-lib-utils/rpc"
-	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v2/apis/volumesnapshot/v1beta1"
-	snapclientset "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned"
+	snapapi "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
+	snapclientset "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned"
 )
 
 //secretParamsMap provides a mapping of current as well as deprecated secret keys

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -52,8 +52,8 @@ import (
 	"github.com/kubernetes-csi/csi-lib-utils/rpc"
 	"github.com/kubernetes-csi/csi-test/v3/driver"
 	"github.com/kubernetes-csi/external-provisioner/pkg/features"
-	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v2/apis/volumesnapshot/v1beta1"
-	"github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned/fake"
+	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
+	"github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake"
 )
 
 func init() {

diff --git a/vendor/github.com/kubernetes-csi/external-snapshotter/client/v3/LICENSE b/vendor/github.com/kubernetes-csi/external-snapshotter/client/v3/LICENSE
diff --git a/...thub.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1/doc.go b/...thub.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1/doc.go
diff --git a/...com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1/register.go b/...com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1/register.go