update snapshotter

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

go.mod

@@ -58,7 +58,7 @@ require (
 	github.com/json-iterator/go v1.1.11
 	github.com/jszwec/csvutil v1.5.0
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0
+	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
 	github.com/kubesphere/sonargo v0.0.2
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect

go.sum

@@ -521,8 +521,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE=
-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/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyPlUHk/ofpgvBcNcawJLtf4PYHORLjAA=
+github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
 github.com/kubesphere/sonargo v0.0.2 h1:hsSRE3sv3mkPcUAeSABdp7rtfcNW2zzeHXzFa01CTkU=
 github.com/kubesphere/sonargo v0.0.2/go.mod h1:ww8n9ANlDXhX5PBZ18iaRnCgEkXN0GMml3/KZXOZ11w=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=

pkg/controller/storage/snapshotclass/snapshotclass_controller.go

@@ -26,10 +26,10 @@ import (
 
 	storagev1 "k8s.io/api/storage/v1"
 
-	snapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
-	snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/typed/volumesnapshot/v1beta1"
-	snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions/volumesnapshot/v1beta1"
-	snapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v3/listers/volumesnapshot/v1beta1"
+	snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
+	snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1"
+	snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions/volumesnapshot/v1"
+	snapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -188,10 +188,10 @@ func (c *VolumeSnapshotClassController) syncHandler(key string) error {
 				_, err = c.snapshotClassLister.Get(name)
 				if err != nil {
 					if errors.IsNotFound(err) {
-						volumeSnapshotClassCreate := &snapshotv1beta1.VolumeSnapshotClass{
+						volumeSnapshotClassCreate := &snapshotv1.VolumeSnapshotClass{
 							ObjectMeta:     metav1.ObjectMeta{Name: name},
 							Driver:         storageClass.Provisioner,
-							DeletionPolicy: snapshotv1beta1.VolumeSnapshotContentDelete,
+							DeletionPolicy: snapshotv1.VolumeSnapshotContentDelete,
 						}
 						_, err = c.snapshotClassClient.Create(context.Background(), volumeSnapshotClassCreate, metav1.CreateOptions{})
 					}

pkg/controller/storage/snapshotclass/snapshotclass_controller_test.go

@@ -24,16 +24,16 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	snapbeta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
-	snapfake "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake"
-	snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions"
-	storagev1 "k8s.io/api/storage/v1"
+	snapshotV1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
+	snapFake "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake"
+	snapInformersV1 "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions"
+	storageV1 "k8s.io/api/storage/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/diff"
-	k8sinformers "k8s.io/client-go/informers"
-	k8sfake "k8s.io/client-go/kubernetes/fake"
+	k8sInformers "k8s.io/client-go/informers"
+	k8sFake "k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
 
@@ -48,15 +48,15 @@ type fixture struct {
 	t                 *testing.T
 	snapshotSupported bool
 	// Clients
-	k8sClient           *k8sfake.Clientset
-	snapshotClassClient *snapfake.Clientset
+	k8sClient           *k8sFake.Clientset
+	snapshotClassClient *snapFake.Clientset
 	ksClient            *ksfake.Clientset
 	// Objects from here preload into NewSimpleFake.
 	storageObjects       []runtime.Object // include StorageClass
 	snapshotClassObjects []runtime.Object
 	// Objects to put in the store.
-	storageClassLister  []*storagev1.StorageClass
-	snapshotClassLister []*snapbeta1.VolumeSnapshotClass
+	storageClassLister  []*storageV1.StorageClass
+	snapshotClassLister []*snapshotV1.VolumeSnapshotClass
 	// Actions expected to happen on the client.
 	actions []core.Action
 }
@@ -65,17 +65,17 @@ func newFixture(t *testing.T) *fixture {
 	return &fixture{t: t}
 }
 
-func (f *fixture) newController() (*VolumeSnapshotClassController, k8sinformers.SharedInformerFactory, snapinformers.SharedInformerFactory) {
-	f.k8sClient = k8sfake.NewSimpleClientset(f.storageObjects...)
-	f.snapshotClassClient = snapfake.NewSimpleClientset(f.snapshotClassObjects...)
+func (f *fixture) newController() (*VolumeSnapshotClassController, k8sInformers.SharedInformerFactory, snapInformersV1.SharedInformerFactory) {
+	f.k8sClient = k8sFake.NewSimpleClientset(f.storageObjects...)
+	f.snapshotClassClient = snapFake.NewSimpleClientset(f.snapshotClassObjects...)
 
-	k8sInformers := k8sinformers.NewSharedInformerFactory(f.k8sClient, noReSyncPeriodFunc())
-	snapshotInformers := snapinformers.NewSharedInformerFactory(f.snapshotClassClient, noReSyncPeriodFunc())
+	k8sInformers := k8sInformers.NewSharedInformerFactory(f.k8sClient, noReSyncPeriodFunc())
+	snapshotInformers := snapInformersV1.NewSharedInformerFactory(f.snapshotClassClient, noReSyncPeriodFunc())
 
 	c := NewController(
 		k8sInformers.Storage().V1().StorageClasses(),
-		f.snapshotClassClient.SnapshotV1beta1().VolumeSnapshotClasses(),
-		snapshotInformers.Snapshot().V1beta1().VolumeSnapshotClasses(),
+		f.snapshotClassClient.SnapshotV1().VolumeSnapshotClasses(),
+		snapshotInformers.Snapshot().V1().VolumeSnapshotClasses(),
 	)
 
 	for _, storageClass := range f.storageClassLister {
@@ -123,12 +123,12 @@ func (f *fixture) run(scName string) {
 	f.runController(scName, true, false)
 }
 
-func (f *fixture) expectCreateSnapshotClassAction(snapshotClass *snapbeta1.VolumeSnapshotClass) {
+func (f *fixture) expectCreateSnapshotClassAction(snapshotClass *snapshotV1.VolumeSnapshotClass) {
 	f.actions = append(f.actions, core.NewCreateAction(
 		schema.GroupVersionResource{Resource: "volumesnapshotclasses"}, snapshotClass.Namespace, snapshotClass))
 }
 
-func (f *fixture) expectDeleteSnapshotClassAction(snapshotClass *snapbeta1.VolumeSnapshotClass) {
+func (f *fixture) expectDeleteSnapshotClassAction(snapshotClass *snapshotV1.VolumeSnapshotClass) {
 	f.actions = append(f.actions, core.NewDeleteAction(
 		schema.GroupVersionResource{Resource: "volumesnapshotclasses"}, snapshotClass.Namespace, snapshotClass.Name))
 }
@@ -194,27 +194,27 @@ func checkAction(expected, actual core.Action, t *testing.T) {
 	}
 }
 
-func newStorageClass(name string) *storagev1.StorageClass {
+func newStorageClass(name string) *storageV1.StorageClass {
 	isExpansion := true
-	return &storagev1.StorageClass{
+	return &storageV1.StorageClass{
 		ObjectMeta: v1.ObjectMeta{
 			Name: name,
 		},
 		AllowVolumeExpansion: &isExpansion,
 	}
 }
 
-func newSnapshotClass(storageClass *storagev1.StorageClass) *snapbeta1.VolumeSnapshotClass {
-	return &snapbeta1.VolumeSnapshotClass{
+func newSnapshotClass(storageClass *storageV1.StorageClass) *snapshotV1.VolumeSnapshotClass {
+	return &snapshotV1.VolumeSnapshotClass{
 		ObjectMeta: v1.ObjectMeta{
 			Name: storageClass.Name,
 		},
 		Driver:         storageClass.Provisioner,
-		DeletionPolicy: snapbeta1.VolumeSnapshotContentDelete,
+		DeletionPolicy: snapshotV1.VolumeSnapshotContentDelete,
 	}
 }
 
-func getKey(sc *storagev1.StorageClass, t *testing.T) string {
+func getKey(sc *storageV1.StorageClass, t *testing.T) string {
 	key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(sc)
 	if err != nil {
 		t.Errorf("Unexpected error getting key for %v: %v", sc.Name, err)