Merge pull request #373 from xing-yang/v3

Update to v3
kubernetes-csi · Sep 14, 2020 · 60202d2 · 60202d2
2 parents 42650bc + a2ac03c
commit 60202d2
Show file tree

Hide file tree

Showing 83 changed files with 166 additions and 166 deletions.
diff --git a/client/clientset/versioned/clientset.go b/client/clientset/versioned/clientset.go
diff --git a/client/clientset/versioned/fake/clientset_generated.go b/client/clientset/versioned/fake/clientset_generated.go
diff --git a/client/clientset/versioned/fake/register.go b/client/clientset/versioned/fake/register.go
diff --git a/client/clientset/versioned/scheme/register.go b/client/clientset/versioned/scheme/register.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshot.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshot.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshot_client.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshot_client.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshotclass.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshotclass.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshotcontent.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/fake/fake_volumesnapshotcontent.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshot.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshot.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshot_client.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshot_client.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshotclass.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshotclass.go
diff --git a/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshotcontent.go b/client/clientset/versioned/typed/volumesnapshot/v1beta1/volumesnapshotcontent.go
diff --git a/client/go.mod b/client/go.mod
@@ -1,6 +1,6 @@
-module github.com/kubernetes-csi/external-snapshotter/client/v2
+module github.com/kubernetes-csi/external-snapshotter/client/v3
 
-go 1.12
+go 1.15
 
 require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect

diff --git a/client/hack/README.md b/client/hack/README.md
@@ -30,9 +30,9 @@ Run: ./hack/update-generated-code.sh from the client directory.
 Once you run the script, you will get an output as follows:
 ```bash
 Generating deepcopy funcs
-Generating clientset for volumesnapshot:v1beta1 at github.com/kubernetes-csi/external-snapshotter/client/v2/clientset
-Generating listers for volumesnapshot:v1beta1 at github.com/kubernetes-csi/external-snapshotter/client/v2/listers
-Generating informers for volumesnapshot:v1beta1 at github.com/kubernetes-csi/external-snapshotter/client/v2/informers
+Generating clientset for volumesnapshot:v1beta1 at github.com/kubernetes-csi/external-snapshotter/client/v3/clientset
+Generating listers for volumesnapshot:v1beta1 at github.com/kubernetes-csi/external-snapshotter/client/v3/listers
+Generating informers for volumesnapshot:v1beta1 at github.com/kubernetes-csi/external-snapshotter/client/v3/informers
 
 ```
 

diff --git a/client/hack/update-generated-code.sh b/client/hack/update-generated-code.sh
@@ -25,13 +25,13 @@ SCRIPT_ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd)
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 ${GOPATH}/src/k8s.io/code-generator/generate-groups.sh "deepcopy,client,informer,lister" \
-  github.com/kubernetes-csi/external-snapshotter/client/v2 github.com/kubernetes-csi/external-snapshotter/client/v2/apis \
+  github.com/kubernetes-csi/external-snapshotter/client/v3 github.com/kubernetes-csi/external-snapshotter/client/v3/apis \
   volumesnapshot:v1beta1 \
   --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
 
 # To use your own boilerplate text use:
 #   --go-header-file ${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt
 
-# Move generated file from client/v2 to client folder and remove client/v2
-cp -rf v2/. .
-rm -rf v2
+# Move generated file from client/v3 to client folder and remove client/v3
+cp -rf v3/. .
+rm -rf v3
diff --git a/client/informers/externalversions/factory.go b/client/informers/externalversions/factory.go
diff --git a/client/informers/externalversions/generic.go b/client/informers/externalversions/generic.go
diff --git a/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/client/informers/externalversions/internalinterfaces/factory_interfaces.go
diff --git a/client/informers/externalversions/volumesnapshot/interface.go b/client/informers/externalversions/volumesnapshot/interface.go
diff --git a/client/informers/externalversions/volumesnapshot/v1beta1/interface.go b/client/informers/externalversions/volumesnapshot/v1beta1/interface.go
diff --git a/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshot.go b/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshot.go
diff --git a/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshotclass.go b/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshotclass.go
diff --git a/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshotcontent.go b/client/informers/externalversions/volumesnapshot/v1beta1/volumesnapshotcontent.go
diff --git a/client/listers/volumesnapshot/v1beta1/volumesnapshot.go b/client/listers/volumesnapshot/v1beta1/volumesnapshot.go
diff --git a/client/listers/volumesnapshot/v1beta1/volumesnapshotclass.go b/client/listers/volumesnapshot/v1beta1/volumesnapshotclass.go
diff --git a/client/listers/volumesnapshot/v1beta1/volumesnapshotcontent.go b/client/listers/volumesnapshot/v1beta1/volumesnapshotcontent.go
diff --git a/cmd/csi-snapshotter/main.go b/cmd/csi-snapshotter/main.go
@@ -38,12 +38,12 @@ import (
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	csirpc "github.com/kubernetes-csi/csi-lib-utils/rpc"
-	controller "github.com/kubernetes-csi/external-snapshotter/v2/pkg/sidecar-controller"
-	"github.com/kubernetes-csi/external-snapshotter/v2/pkg/snapshotter"
+	controller "github.com/kubernetes-csi/external-snapshotter/v3/pkg/sidecar-controller"
+	"github.com/kubernetes-csi/external-snapshotter/v3/pkg/snapshotter"
 
-	clientset "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned"
-	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned/scheme"
-	informers "github.com/kubernetes-csi/external-snapshotter/client/v2/informers/externalversions"
+	clientset "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned"
+	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/scheme"
+	informers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions"
 	coreinformers "k8s.io/client-go/informers"
 )
 

diff --git a/cmd/snapshot-controller/main.go b/cmd/snapshot-controller/main.go
@@ -31,11 +31,11 @@ import (
 	klog "k8s.io/klog/v2"
 
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
-	controller "github.com/kubernetes-csi/external-snapshotter/v2/pkg/common-controller"
+	controller "github.com/kubernetes-csi/external-snapshotter/v3/pkg/common-controller"
 
-	clientset "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned"
-	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned/scheme"
-	informers "github.com/kubernetes-csi/external-snapshotter/client/v2/informers/externalversions"
+	clientset "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned"
+	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/scheme"
+	informers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions"
 	coreinformers "k8s.io/client-go/informers"
 )
 

diff --git a/cmd/validation-webhook/main.go b/cmd/validation-webhook/main.go
@@ -19,7 +19,7 @@ package main
 import (
 	"flag"
 
-	webhook "github.com/kubernetes-csi/external-snapshotter/v2/pkg/validation-webhook"
+	webhook "github.com/kubernetes-csi/external-snapshotter/v3/pkg/validation-webhook"
 	"k8s.io/klog"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/kubernetes-csi/external-snapshotter/v2
+module github.com/kubernetes-csi/external-snapshotter/v3
 
 go 1.15
 
@@ -10,7 +10,7 @@ require (
 	github.com/imdario/mergo v0.3.9 // indirect
 	github.com/kubernetes-csi/csi-lib-utils v0.7.0
 	github.com/kubernetes-csi/csi-test v2.0.0+incompatible
-	github.com/kubernetes-csi/external-snapshotter/client/v2 v2.0.0-00010101000000-000000000000
+	github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.10.0
@@ -26,7 +26,7 @@ require (
 )
 
 replace (
-	github.com/kubernetes-csi/external-snapshotter/client/v2 => ./client
+	github.com/kubernetes-csi/external-snapshotter/client/v3 => ./client
 	k8s.io/api => k8s.io/api v0.19.0
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
 	k8s.io/apimachinery => k8s.io/apimachinery v0.19.0

diff --git a/pkg/common-controller/framework_test.go b/pkg/common-controller/framework_test.go
@@ -28,13 +28,13 @@ import (
 	"testing"
 	"time"
 
-	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v2/apis/volumesnapshot/v1beta1"
-	clientset "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned"
-	"github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned/fake"
-	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v2/clientset/versioned/scheme"
-	informers "github.com/kubernetes-csi/external-snapshotter/client/v2/informers/externalversions"
-	storagelisters "github.com/kubernetes-csi/external-snapshotter/client/v2/listers/volumesnapshot/v1beta1"
-	"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
+	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
+	clientset "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned"
+	"github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake"
+	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/scheme"
+	informers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions"
+	storagelisters "github.com/kubernetes-csi/external-snapshotter/client/v3/listers/volumesnapshot/v1beta1"
+	"github.com/kubernetes-csi/external-snapshotter/v3/pkg/utils"
 	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

diff --git a/pkg/common-controller/snapshot_controller.go b/pkg/common-controller/snapshot_controller.go
@@ -32,8 +32,8 @@ import (
 	ref "k8s.io/client-go/tools/reference"
 	klog "k8s.io/klog/v2"
 
-	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v2/apis/volumesnapshot/v1beta1"
-	"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
+	crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
+	"github.com/kubernetes-csi/external-snapshotter/v3/pkg/utils"
 )
 
 // ==================================================================