Switch to volumesnapshot v1 in pkg and tests

Signed-off-by: Alex Kalenyuk <[email protected]>

go.mod

@@ -32,7 +32,7 @@ require (
 	github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8
 	github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20191119172530-79f836b90111
 	github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
-	github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1
+	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
 	github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b
 	github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed
 	github.com/moby/sys/mountinfo v0.4.1
@@ -120,6 +120,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect

go.sum

@@ -885,6 +885,8 @@ github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414 h1:6wnYc2S/lVM7BvR32B
 github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414/go.mod h1:0AqAH3ZogsCrvrtUpvc6EtVKbc3w6xwZhkvGLuqyi3o=
 github.com/kubernetes-csi/csi-lib-utils v0.7.0/go.mod h1:bze+2G9+cmoHxN6+WyG1qT4MDxgZJMLGwc7V4acPNm0=
 github.com/kubernetes-csi/csi-test v2.0.0+incompatible/go.mod h1:YxJ4UiuPWIhMBkxUKY5c267DyA0uDZ/MtAimhx/2TA0=
+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/kubernetes-csi/external-snapshotter/v2 v2.1.1 h1:t5bmB3Y8nCaLA4aFrIpX0zjHEF/HUkJp6f5rm7BsVzM=
 github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1/go.mod h1:dV5oB3U62KBdlf9ADWkMmjGd3USauqQtwIm2OZb5mqI=
 github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
@@ -1702,6 +1704,7 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=

pkg/controller/BUILD.bazel

@@ -27,7 +27,7 @@ go_library(
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
         "//vendor/github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1:go_default_library",
-        "//vendor/github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1:go_default_library",
+        "//vendor/github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1:go_default_library",
         "//vendor/github.com/openshift/api/security/v1:go_default_library",
         "//vendor/k8s.io/api/admissionregistration/v1:go_default_library",
         "//vendor/k8s.io/api/apps/v1:go_default_library",

pkg/controller/virtinformers.go

@@ -29,7 +29,7 @@ import (
 	"kubevirt.io/api/flavor"
 
 	promv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	secv1 "github.com/openshift/api/security/v1"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -1080,12 +1080,12 @@ func (f *kubeInformerFactory) Pod() cache.SharedIndexInformer {
 func VolumeSnapshotInformer(clientSet kubecli.KubevirtClient, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	restClient := clientSet.KubernetesSnapshotClient().SnapshotV1beta1().RESTClient()
 	lw := cache.NewListWatchFromClient(restClient, "volumesnapshots", k8sv1.NamespaceAll, fields.Everything())
-	return cache.NewSharedIndexInformer(lw, &vsv1beta1.VolumeSnapshot{}, resyncPeriod, cache.Indexers{})
+	return cache.NewSharedIndexInformer(lw, &vsv1.VolumeSnapshot{}, resyncPeriod, cache.Indexers{})
 }
 
 // VolumeSnapshotClassInformer returns an informer for VolumeSnapshotClasses
 func VolumeSnapshotClassInformer(clientSet kubecli.KubevirtClient, resyncPeriod time.Duration) cache.SharedIndexInformer {
 	restClient := clientSet.KubernetesSnapshotClient().SnapshotV1beta1().RESTClient()
 	lw := cache.NewListWatchFromClient(restClient, "volumesnapshotclasses", k8sv1.NamespaceAll, fields.Everything())
-	return cache.NewSharedIndexInformer(lw, &vsv1beta1.VolumeSnapshotClass{}, resyncPeriod, cache.Indexers{})
+	return cache.NewSharedIndexInformer(lw, &vsv1.VolumeSnapshotClass{}, resyncPeriod, cache.Indexers{})
 }

pkg/virt-controller/watch/BUILD.bazel

@@ -50,7 +50,7 @@ go_library(
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
         "//staging/src/kubevirt.io/client-go/util:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
-        "//vendor/github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1:go_default_library",
+        "//vendor/github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",

pkg/virt-controller/watch/application.go

@@ -31,7 +31,7 @@ import (
 	"kubevirt.io/kubevirt/pkg/flavor"
 
 	"github.com/emicklei/go-restful"
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	flag "github.com/spf13/pflag"
@@ -232,7 +232,7 @@ type VirtControllerApp struct {
 var _ service.Service = &VirtControllerApp{}
 
 func init() {
-	vsv1beta1.AddToScheme(scheme.Scheme)
+	vsv1.AddToScheme(scheme.Scheme)
 	snapshotv1.AddToScheme(scheme.Scheme)
 	poolv1.AddToScheme(scheme.Scheme)
 

pkg/virt-controller/watch/snapshot/BUILD.bazel

@@ -20,7 +20,7 @@ go_library(
         "//staging/src/kubevirt.io/api/snapshot/v1alpha1:go_default_library",
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/log:go_default_library",
-        "//vendor/github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1:go_default_library",
+        "//vendor/github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1:go_default_library",
         "//vendor/k8s.io/api/apps/v1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/storage/v1:go_default_library",
@@ -59,7 +59,7 @@ go_test(
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/testutils:go_default_library",
         "//vendor/github.com/golang/mock/gomock:go_default_library",
-        "//vendor/github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1:go_default_library",
+        "//vendor/github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1:go_default_library",
         "//vendor/github.com/onsi/ginkgo/v2:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/apps/v1:go_default_library",

pkg/virt-controller/watch/snapshot/restore.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
@@ -679,7 +679,7 @@ func (ctrl *VMRestoreController) createRestorePVC(
 	}
 	pvc.Annotations[pvcRestoreAnnotation] = vmRestore.Name
 
-	apiGroup := vsv1beta1.GroupName
+	apiGroup := vsv1.GroupName
 	pvc.Spec.DataSource = &corev1.TypedLocalObjectReference{
 		APIGroup: &apiGroup,
 		Kind:     "VolumeSnapshot",

pkg/virt-controller/watch/snapshot/snapshot.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
@@ -103,7 +103,7 @@ func getVMSnapshotContentName(vmSnapshot *snapshotv1.VirtualMachineSnapshot) str
 	return fmt.Sprintf("%s-%s", "vmsnapshot-content", vmSnapshot.UID)
 }
 
-func translateError(e *vsv1beta1.VolumeSnapshotError) *snapshotv1.Error {
+func translateError(e *vsv1.VolumeSnapshotError) *snapshotv1.Error {
 	if e == nil {
 		return nil
 	}
@@ -360,7 +360,7 @@ func (ctrl *VMSnapshotController) updateVMSnapshotContent(content *snapshotv1.Vi
 func (ctrl *VMSnapshotController) createVolumeSnapshot(
 	content *snapshotv1.VirtualMachineSnapshotContent,
 	volumeBackup snapshotv1.VolumeBackup,
-) (*vsv1beta1.VolumeSnapshot, error) {
+) (*vsv1.VolumeSnapshot, error) {
 	log.Log.Infof("Attempting to create VolumeSnapshot %s", *volumeBackup.VolumeSnapshotName)
 
 	sc := volumeBackup.PersistentVolumeClaim.Spec.StorageClassName
@@ -376,7 +376,7 @@ func (ctrl *VMSnapshotController) createVolumeSnapshot(
 	}
 
 	t := true
-	snapshot := &vsv1beta1.VolumeSnapshot{
+	snapshot := &vsv1.VolumeSnapshot{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: *volumeBackup.VolumeSnapshotName,
 			OwnerReferences: []metav1.OwnerReference{
@@ -390,8 +390,8 @@ func (ctrl *VMSnapshotController) createVolumeSnapshot(
 				},
 			},
 		},
-		Spec: vsv1beta1.VolumeSnapshotSpec{
-			Source: vsv1beta1.VolumeSnapshotSource{
+		Spec: vsv1.VolumeSnapshotSpec{
+			Source: vsv1.VolumeSnapshotSource{
 				PersistentVolumeClaimName: &volumeBackup.PersistentVolumeClaim.Name,
 			},
 			VolumeSnapshotClassName: &volumeSnapshotClass,
@@ -548,7 +548,7 @@ func (ctrl *VMSnapshotController) getVolumeSnapshotClass(storageClassName string
 
 	storageClass := obj.(*storagev1.StorageClass).DeepCopy()
 
-	var matches []vsv1beta1.VolumeSnapshotClass
+	var matches []vsv1.VolumeSnapshotClass
 	volumeSnapshotClasses := ctrl.getVolumeSnapshotClasses()
 	for _, volumeSnapshotClass := range volumeSnapshotClasses {
 		if volumeSnapshotClass.Driver == storageClass.Provisioner {

pkg/virt-controller/watch/snapshot/snapshot_base.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	corev1 "k8s.io/api/core/v1"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -455,7 +455,7 @@ func (ctrl *VMSnapshotController) handleVolumeSnapshotClass(obj interface{}) {
 		obj = unknown.Obj
 	}
 
-	if _, ok := obj.(*vsv1beta1.VolumeSnapshotClass); ok {
+	if _, ok := obj.(*vsv1.VolumeSnapshotClass); ok {
 		for _, vmKey := range ctrl.VMInformer.GetStore().ListKeys() {
 			ctrl.vmQueue.Add(vmKey)
 		}
@@ -500,7 +500,7 @@ func (ctrl *VMSnapshotController) handleVolumeSnapshot(obj interface{}) {
 		obj = unknown.Obj
 	}
 
-	if volumeSnapshot, ok := obj.(*vsv1beta1.VolumeSnapshot); ok {
+	if volumeSnapshot, ok := obj.(*vsv1.VolumeSnapshot); ok {
 		k, _ := cache.MetaNamespaceKeyFunc(volumeSnapshot)
 		keys, err := ctrl.VMSnapshotContentInformer.GetIndexer().IndexKeys("volumeSnapshot", k)
 		if err != nil {
@@ -555,7 +555,7 @@ func (ctrl *VMSnapshotController) handlePVC(obj interface{}) {
 	}
 }
 
-func (ctrl *VMSnapshotController) getVolumeSnapshot(namespace, name string) (*vsv1beta1.VolumeSnapshot, error) {
+func (ctrl *VMSnapshotController) getVolumeSnapshot(namespace, name string) (*vsv1.VolumeSnapshot, error) {
 	di := ctrl.dynamicInformerMap[volumeSnapshotCRD]
 	di.mutex.Lock()
 	defer di.mutex.Unlock()
@@ -570,10 +570,10 @@ func (ctrl *VMSnapshotController) getVolumeSnapshot(namespace, name string) (*vs
 		return nil, err
 	}
 
-	return obj.(*vsv1beta1.VolumeSnapshot).DeepCopy(), nil
+	return obj.(*vsv1.VolumeSnapshot).DeepCopy(), nil
 }
 
-func (ctrl *VMSnapshotController) getVolumeSnapshotClasses() []vsv1beta1.VolumeSnapshotClass {
+func (ctrl *VMSnapshotController) getVolumeSnapshotClasses() []vsv1.VolumeSnapshotClass {
 	di := ctrl.dynamicInformerMap[volumeSnapshotClassCRD]
 	di.mutex.Lock()
 	defer di.mutex.Unlock()
@@ -582,10 +582,10 @@ func (ctrl *VMSnapshotController) getVolumeSnapshotClasses() []vsv1beta1.VolumeS
 		return nil
 	}
 
-	var vscs []vsv1beta1.VolumeSnapshotClass
+	var vscs []vsv1.VolumeSnapshotClass
 	objs := di.informer.GetStore().List()
 	for _, obj := range objs {
-		vsc := obj.(*vsv1beta1.VolumeSnapshotClass).DeepCopy()
+		vsc := obj.(*vsv1.VolumeSnapshotClass).DeepCopy()
 		vscs = append(vscs, *vsc)
 	}
 

pkg/virt-controller/watch/snapshot/snapshot_test.go

@@ -10,7 +10,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
@@ -158,23 +158,23 @@ var _ = Describe("Snapshot controlleer", func() {
 		}
 	}
 
-	createVolumeSnapshots := func(content *snapshotv1.VirtualMachineSnapshotContent) []vsv1beta1.VolumeSnapshot {
-		var volumeSnapshots []vsv1beta1.VolumeSnapshot
+	createVolumeSnapshots := func(content *snapshotv1.VirtualMachineSnapshotContent) []vsv1.VolumeSnapshot {
+		var volumeSnapshots []vsv1.VolumeSnapshot
 		for _, vb := range content.Spec.VolumeBackups {
 			if vb.VolumeSnapshotName == nil {
 				continue
 			}
-			vs := vsv1beta1.VolumeSnapshot{
+			vs := vsv1.VolumeSnapshot{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      *vb.VolumeSnapshotName,
 					Namespace: content.Namespace,
 				},
-				Spec: vsv1beta1.VolumeSnapshotSpec{
-					Source: vsv1beta1.VolumeSnapshotSource{
+				Spec: vsv1.VolumeSnapshotSpec{
+					Source: vsv1.VolumeSnapshotSource{
 						PersistentVolumeClaimName: &vb.PersistentVolumeClaim.Name,
 					},
 				},
-				Status: &vsv1beta1.VolumeSnapshotStatus{
+				Status: &vsv1.VolumeSnapshotStatus{
 					ReadyToUse: &f,
 				},
 			}
@@ -183,8 +183,8 @@ var _ = Describe("Snapshot controlleer", func() {
 		return volumeSnapshots
 	}
 
-	createVolumeSnapshotClasses := func() []vsv1beta1.VolumeSnapshotClass {
-		return []vsv1beta1.VolumeSnapshotClass{
+	createVolumeSnapshotClasses := func() []vsv1.VolumeSnapshotClass {
+		return []vsv1.VolumeSnapshotClass{
 			{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: volumeSnapshotClassName,
@@ -283,8 +283,8 @@ var _ = Describe("Snapshot controlleer", func() {
 			vmInformer, vmSource = testutils.NewFakeInformerWithIndexersFor(&v1.VirtualMachine{}, virtcontroller.GetVirtualMachineInformerIndexers())
 			vmiInformer, vmiSource = testutils.NewFakeInformerWithIndexersFor(&v1.VirtualMachineInstance{}, virtcontroller.GetVMIInformerIndexers())
 			podInformer, podSource = testutils.NewFakeInformerFor(&corev1.Pod{})
-			volumeSnapshotInformer, volumeSnapshotSource = testutils.NewFakeInformerFor(&vsv1beta1.VolumeSnapshot{})
-			volumeSnapshotClassInformer, volumeSnapshotClassSource = testutils.NewFakeInformerFor(&vsv1beta1.VolumeSnapshotClass{})
+			volumeSnapshotInformer, volumeSnapshotSource = testutils.NewFakeInformerFor(&vsv1.VolumeSnapshot{})
+			volumeSnapshotClassInformer, volumeSnapshotClassSource = testutils.NewFakeInformerFor(&vsv1.VolumeSnapshotClass{})
 			storageClassInformer, storageClassSource = testutils.NewFakeInformerFor(&storagev1.StorageClass{})
 			pvcInformer, pvcSource = testutils.NewFakeInformerFor(&corev1.PersistentVolumeClaim{})
 			crdInformer, crdSource = testutils.NewFakeInformerFor(&extv1.CustomResourceDefinition{})
@@ -378,7 +378,7 @@ var _ = Describe("Snapshot controlleer", func() {
 			mockVMSnapshotQueue.Wait()
 		}
 
-		addVolumeSnapshot := func(s *vsv1beta1.VolumeSnapshot) {
+		addVolumeSnapshot := func(s *vsv1.VolumeSnapshot) {
 			syncCaches(stop)
 			mockVMSnapshotContentQueue.ExpectAdds(1)
 			volumeSnapshotSource.Add(s)
@@ -1203,7 +1203,7 @@ var _ = Describe("Snapshot controlleer", func() {
 					message := "bad error"
 					volumeSnapshots[i].Status.ReadyToUse = &rtu
 					volumeSnapshots[i].Status.CreationTime = ct
-					volumeSnapshots[i].Status.Error = &vsv1beta1.VolumeSnapshotError{
+					volumeSnapshots[i].Status.Error = &vsv1.VolumeSnapshotError{
 						Message: &message,
 						Time:    timeFunc(),
 					}
@@ -1956,7 +1956,7 @@ func expectVolumeSnapshotCreates(
 		create, ok := action.(testing.CreateAction)
 		Expect(ok).To(BeTrue())
 
-		createObj := create.GetObject().(*vsv1beta1.VolumeSnapshot)
+		createObj := create.GetObject().(*vsv1.VolumeSnapshot)
 		pvc, ok := volumeSnapshots[createObj.Name]
 		Expect(ok).To(BeTrue())
 		Expect(pvc).Should(Equal(*createObj.Spec.Source.PersistentVolumeClaimName))

tests/storage/BUILD.bazel

@@ -39,7 +39,7 @@ go_library(
         "//tests/libvmi:go_default_library",
         "//tests/util:go_default_library",
         "//vendor/github.com/google/goexpect:go_default_library",
-        "//vendor/github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1:go_default_library",
+        "//vendor/github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1:go_default_library",
         "//vendor/github.com/onsi/ginkgo/v2:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",

tests/storage/snapshot.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	expect "github.com/google/goexpect"
-	vsv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
@@ -126,8 +126,8 @@ var _ = SIGDescribe("[Serial]VirtualMachineSnapshot Tests", func() {
 							admissionregistrationv1.Create,
 						},
 						Rule: admissionregistrationv1.Rule{
-							APIGroups:   []string{vsv1beta1.GroupName},
-							APIVersions: []string{vsv1beta1.SchemeGroupVersion.Version},
+							APIGroups:   []string{vsv1.GroupName},
+							APIVersions: []string{vsv1.SchemeGroupVersion.Version},
 							Resources:   []string{"volumesnapshots"},
 						},
 					}},
@@ -945,7 +945,7 @@ var _ = SIGDescribe("[Serial]VirtualMachineSnapshot Tests", func() {
 
 					vsc := vs.DeepCopy()
 					t := metav1.Now()
-					vsc.Status.Error = &vsv1beta1.VolumeSnapshotError{
+					vsc.Status.Error = &vsv1.VolumeSnapshotError{
 						Time:    &t,
 						Message: &m,
 					}