Update github.com/kubernetes-csi/external-snapshotter (gardener#7759)

from v2.1.4 to v4.2.0

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/google/gnostic v0.5.7-v3refs
 	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/kubernetes-csi/external-snapshotter/v2 v2.1.4
+	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/mitchellh/hashstructure/v2 v2.0.2
 	github.com/onsi/ginkgo/v2 v2.8.3

pkg/client/kubernetes/types.go

@@ -20,7 +20,7 @@ import (
 	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
 	hvpav1alpha1 "github.com/gardener/hvpa-controller/api/v1alpha1"
 	machinev1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1"
-	volumesnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	istionetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
 	istionetworkingv1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1"
 	apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
@@ -122,7 +122,7 @@ var (
 		apiregistrationscheme.AddToScheme,
 		vpaautoscalingv1.AddToScheme,
 		metricsv1beta1.AddToScheme,
-		volumesnapshotv1beta1.AddToScheme,
+		volumesnapshotv1.AddToScheme,
 	)
 )
 

pkg/operation/botanist/cleanup.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"strconv"
 
-	volumesnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
@@ -243,8 +243,8 @@ func (b *Botanist) CleanKubernetesResources(ctx context.Context) error {
 		return flow.Parallel(
 			cleanResourceFn(ops, c, &corev1.ServiceList{}, ServiceCleanOption, cleanOptions),
 			cleanResourceFn(ops, c, &corev1.PersistentVolumeClaimList{}, PersistentVolumeClaimCleanOption, cleanOptions),
-			cleanResourceFn(ops, c, &volumesnapshotv1beta1.VolumeSnapshotList{}, VolumeSnapshotContentCleanOption, cleanOptions),
-			cleanResourceFn(ops, c, &volumesnapshotv1beta1.VolumeSnapshotContentList{}, VolumeSnapshotContentCleanOption, cleanOptions),
+			cleanResourceFn(ops, c, &volumesnapshotv1.VolumeSnapshotList{}, VolumeSnapshotContentCleanOption, cleanOptions),
+			cleanResourceFn(ops, c, &volumesnapshotv1.VolumeSnapshotContentList{}, VolumeSnapshotContentCleanOption, cleanOptions),
 		)(ctx)
 	}
 
@@ -271,8 +271,8 @@ func (b *Botanist) CleanKubernetesResources(ctx context.Context) error {
 		cleanResourceFn(ops, c, &corev1.PersistentVolumeClaimList{}, PersistentVolumeClaimCleanOption, cleanOptions),
 		// Cleaning up VolumeSnapshots can take a longer time if many snapshots were taken.
 		// Hence, we only finalize these objects after 1h.
-		cleanResourceFn(ops, c, &volumesnapshotv1beta1.VolumeSnapshotList{}, VolumeSnapshotContentCleanOption, snapshotCleanOptions),
-		cleanResourceFn(snapshotContentOps, c, &volumesnapshotv1beta1.VolumeSnapshotContentList{}, VolumeSnapshotContentCleanOption, snapshotCleanOptions),
+		cleanResourceFn(ops, c, &volumesnapshotv1.VolumeSnapshotList{}, VolumeSnapshotContentCleanOption, snapshotCleanOptions),
+		cleanResourceFn(snapshotContentOps, c, &volumesnapshotv1.VolumeSnapshotContentList{}, VolumeSnapshotContentCleanOption, snapshotCleanOptions),
 	)(ctx)
 }
 

pkg/resourcemanager/client/scheme.go

@@ -18,7 +18,7 @@ import (
 	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
 	hvpav1alpha1 "github.com/gardener/hvpa-controller/api/v1alpha1"
 	machinev1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1"
-	volumesnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	apiextensionsinstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -50,7 +50,7 @@ func init() {
 		targetSchemeBuilder = runtime.NewSchemeBuilder(
 			kubernetesscheme.AddToScheme,
 			hvpav1alpha1.AddToScheme,
-			volumesnapshotv1beta1.AddToScheme,
+			volumesnapshotv1.AddToScheme,
 		)
 	)
 

pkg/utils/kubernetes/client/client_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
-	volumesnapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
+	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -335,7 +335,7 @@ var _ = Describe("Cleaner", func() {
 			cleanOps []CleanOption
 
 			deletionTimestamp                metav1.Time
-			cleanupContent, remainingContent map[string]*volumesnapshotv1beta1.VolumeSnapshotContent
+			cleanupContent, remainingContent map[string]*volumesnapshotv1.VolumeSnapshotContent
 		)
 
 		BeforeEach(func() {
@@ -359,7 +359,7 @@ var _ = Describe("Cleaner", func() {
 				},
 			}
 
-			cleanupContent = map[string]*volumesnapshotv1beta1.VolumeSnapshotContent{
+			cleanupContent = map[string]*volumesnapshotv1.VolumeSnapshotContent{
 				"content1": {
 					ObjectMeta: metav1.ObjectMeta{
 						DeletionTimestamp: &deletionTimestamp,
@@ -396,7 +396,7 @@ var _ = Describe("Cleaner", func() {
 				},
 			}
 
-			remainingContent = map[string]*volumesnapshotv1beta1.VolumeSnapshotContent{
+			remainingContent = map[string]*volumesnapshotv1.VolumeSnapshotContent{
 				// Object not in deletion.
 				"content4": {
 					ObjectMeta: metav1.ObjectMeta{
@@ -443,9 +443,9 @@ var _ = Describe("Cleaner", func() {
 		})
 
 		It("should maintain the right annotations for all contents in the list to be cleaned up", func() {
-			Expect(cleaner.Clean(ctx, cl, &volumesnapshotv1beta1.VolumeSnapshotContentList{}, cleanOps...)).To(Succeed())
+			Expect(cleaner.Clean(ctx, cl, &volumesnapshotv1.VolumeSnapshotContentList{}, cleanOps...)).To(Succeed())
 
-			contents := &volumesnapshotv1beta1.VolumeSnapshotContentList{}
+			contents := &volumesnapshotv1.VolumeSnapshotContentList{}
 			Expect(cl.List(ctx, contents)).To(Succeed())
 
 			for _, content := range contents.Items {
@@ -465,7 +465,7 @@ var _ = Describe("Cleaner", func() {
 
 			Expect(cleaner.Clean(ctx, cl, cleanupContent, cleanOps...)).To(Succeed())
 
-			content := &volumesnapshotv1beta1.VolumeSnapshotContent{}
+			content := &volumesnapshotv1.VolumeSnapshotContent{}
 			Expect(cl.Get(ctx, client.ObjectKeyFromObject(cleanupContent), content)).To(Succeed())
 
 			Expect(content.Annotations).To(HaveKeyWithValue("snapshot.storage.kubernetes.io/volumesnapshot-being-deleted", "yes"))