diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go index 1eeb378d9..4060e6f00 100644 --- a/cmd/controller-manager/app/controllers.go +++ b/cmd/controller-manager/app/controllers.go @@ -105,8 +105,8 @@ func addControllers( volumeSnapshotController := snapshotclass.NewController( kubernetesInformer.Storage().V1().StorageClasses(), - client.Snapshot().SnapshotV1beta1().VolumeSnapshotClasses(), - informerFactory.SnapshotSharedInformerFactory().Snapshot().V1beta1().VolumeSnapshotClasses(), + client.Snapshot().SnapshotV1().VolumeSnapshotClasses(), + informerFactory.SnapshotSharedInformerFactory().Snapshot().V1().VolumeSnapshotClasses(), ) var fedUserCache, fedGlobalRoleBindingCache, fedGlobalRoleCache cache.Store diff --git a/pkg/controller/storage/snapshotclass/snapshotclass_controller_test.go b/pkg/controller/storage/snapshotclass/snapshotclass_controller_test.go index 521afb1d8..e2756fc21 100644 --- a/pkg/controller/storage/snapshotclass/snapshotclass_controller_test.go +++ b/pkg/controller/storage/snapshotclass/snapshotclass_controller_test.go @@ -82,7 +82,7 @@ func (f *fixture) newController() (*VolumeSnapshotClassController, k8sInformers. _ = k8sInformers.Storage().V1().StorageClasses().Informer().GetIndexer().Add(storageClass) } for _, snapshotClass := range f.snapshotClassLister { - _ = snapshotInformers.Snapshot().V1beta1().VolumeSnapshotClasses().Informer().GetIndexer().Add(snapshotClass) + _ = snapshotInformers.Snapshot().V1().VolumeSnapshotClasses().Informer().GetIndexer().Add(snapshotClass) } return c, k8sInformers, snapshotInformers diff --git a/pkg/informers/informers.go b/pkg/informers/informers.go index c7b08c180..47149849d 100644 --- a/pkg/informers/informers.go +++ b/pkg/informers/informers.go @@ -19,8 +19,8 @@ package informers import ( "time" - snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned" - snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned" + snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" prominformers "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" istioclient "istio.io/client-go/pkg/clientset/versioned" diff --git a/pkg/informers/null_informers.go b/pkg/informers/null_informers.go index 84b89409f..e8e7bb0ce 100644 --- a/pkg/informers/null_informers.go +++ b/pkg/informers/null_informers.go @@ -19,7 +19,7 @@ package informers import ( "time" - snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" prominformers "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions" promfake "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/fake" istioinformers "istio.io/client-go/pkg/informers/externalversions" diff --git a/pkg/kapis/monitoring/v1alpha3/helper_test.go b/pkg/kapis/monitoring/v1alpha3/helper_test.go index c9882f756..c9c651731 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper_test.go +++ b/pkg/kapis/monitoring/v1alpha3/helper_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" + fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" corev1 "k8s.io/api/core/v1" fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" diff --git a/pkg/kapis/resources/v1alpha3/handler_test.go b/pkg/kapis/resources/v1alpha3/handler_test.go index f2dcf44ae..519ec0d20 100644 --- a/pkg/kapis/resources/v1alpha3/handler_test.go +++ b/pkg/kapis/resources/v1alpha3/handler_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" + fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go b/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go index 1d1994f8f..53b51461a 100644 --- a/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go +++ b/pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go @@ -19,7 +19,7 @@ package persistentvolumeclaim import ( "strconv" - snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" "k8s.io/client-go/informers" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" diff --git a/pkg/models/resources/v1alpha2/resource/resource_test.go b/pkg/models/resources/v1alpha2/resource/resource_test.go index 69e863d5e..d80dddde1 100644 --- a/pkg/models/resources/v1alpha2/resource/resource_test.go +++ b/pkg/models/resources/v1alpha2/resource/resource_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" + fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/models/resources/v1alpha2/storageclass/storageclasses.go b/pkg/models/resources/v1alpha2/storageclass/storageclasses.go index 98034ab26..6ef1bb720 100644 --- a/pkg/models/resources/v1alpha2/storageclass/storageclasses.go +++ b/pkg/models/resources/v1alpha2/storageclass/storageclasses.go @@ -20,7 +20,7 @@ import ( "sort" "strconv" - snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshotinformer "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go index 85d57432d..02d27e4b4 100644 --- a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go +++ b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -128,7 +128,7 @@ func (p *persistentVolumeClaimGetter) isSnapshotAllowed(provisioner string) bool if len(provisioner) == 0 { return false } - volumeSnapshotClasses, err := p.snapshotInformers.Snapshot().V1beta1().VolumeSnapshotClasses().Lister().List(labels.Everything()) + volumeSnapshotClasses, err := p.snapshotInformers.Snapshot().V1().VolumeSnapshotClasses().Lister().List(labels.Everything()) if err != nil { return false } diff --git a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go index 10719519b..6d9c8d321 100644 --- a/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go +++ b/pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go @@ -20,9 +20,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - snapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" - snapshotefakeclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" - snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshot "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" + snapshotefakeclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake" + snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" @@ -245,7 +245,7 @@ func prepare() v1alpha3.Interface { _ = informer.Core().V1().Pods().Informer().GetIndexer().Add(pod) } for _, volumeSnapshotClass := range volumeSnapshotClasses { - _ = snapshotInformers.Snapshot().V1beta1().VolumeSnapshotClasses().Informer().GetIndexer().Add(volumeSnapshotClass) + _ = snapshotInformers.Snapshot().V1().VolumeSnapshotClasses().Informer().GetIndexer().Add(volumeSnapshotClass) } return New(informer, snapshotInformers) diff --git a/pkg/models/resources/v1alpha3/resource/resource.go b/pkg/models/resources/v1alpha3/resource/resource.go index 51e559d51..3bdcf7945 100644 --- a/pkg/models/resources/v1alpha3/resource/resource.go +++ b/pkg/models/resources/v1alpha3/resource/resource.go @@ -21,7 +21,7 @@ import ( "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/persistentvolume" - snapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" + snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -116,7 +116,7 @@ func NewResourceGetter(factory informers.InformerFactory, cache cache.Cache) *Re namespacedResourceGetters[schema.GroupVersionResource{Group: "app.k8s.io", Version: "v1beta1", Resource: "applications"}] = application.New(cache) clusterResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"}] = persistentvolume.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumeclaims"}] = persistentvolumeclaim.New(factory.KubernetesSharedInformerFactory(), factory.SnapshotSharedInformerFactory()) - namespacedResourceGetters[snapshotv1beta1.SchemeGroupVersion.WithResource("volumesnapshots")] = volumesnapshot.New(factory.SnapshotSharedInformerFactory()) + namespacedResourceGetters[snapshotv1.SchemeGroupVersion.WithResource("volumesnapshots")] = volumesnapshot.New(factory.SnapshotSharedInformerFactory()) namespacedResourceGetters[rbacv1.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralRoleBinding)] = rolebinding.New(factory.KubernetesSharedInformerFactory()) namespacedResourceGetters[rbacv1.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralRole)] = role.New(factory.KubernetesSharedInformerFactory()) clusterResourceGetters[schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1", Resource: "customresourcedefinitions"}] = customresourcedefinition.New(factory.ApiExtensionSharedInformerFactory()) diff --git a/pkg/models/resources/v1alpha3/resource/resource_test.go b/pkg/models/resources/v1alpha3/resource/resource_test.go index f341f48f2..621d6fb73 100644 --- a/pkg/models/resources/v1alpha3/resource/resource_test.go +++ b/pkg/models/resources/v1alpha3/resource/resource_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" + fakesnapshot "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake" fakeistio "istio.io/client-go/pkg/clientset/versioned/fake" corev1 "k8s.io/api/core/v1" fakeapiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" diff --git a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go index 0da51657f..186137252 100644 --- a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go +++ b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go @@ -17,8 +17,8 @@ limitations under the License. package volumesnapshot import ( - "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" - "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + v1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" + "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" "k8s.io/apimachinery/pkg/runtime" "kubesphere.io/kubesphere/pkg/api" @@ -44,11 +44,11 @@ func New(informer externalversions.SharedInformerFactory) v1alpha3.Interface { } func (v *volumeSnapshotGetter) Get(namespace, name string) (runtime.Object, error) { - return v.informers.Snapshot().V1beta1().VolumeSnapshots().Lister().VolumeSnapshots(namespace).Get(name) + return v.informers.Snapshot().V1().VolumeSnapshots().Lister().VolumeSnapshots(namespace).Get(name) } func (v *volumeSnapshotGetter) List(namespace string, query *query.Query) (*api.ListResult, error) { - all, err := v.informers.Snapshot().V1beta1().VolumeSnapshots().Lister().VolumeSnapshots(namespace).List(query.Selector()) + all, err := v.informers.Snapshot().V1().VolumeSnapshots().Lister().VolumeSnapshots(namespace).List(query.Selector()) if err != nil { return nil, err } @@ -62,11 +62,11 @@ func (v *volumeSnapshotGetter) List(namespace string, query *query.Query) (*api. } func (v *volumeSnapshotGetter) compare(left, right runtime.Object, field query.Field) bool { - leftSnapshot, ok := left.(*v1beta1.VolumeSnapshot) + leftSnapshot, ok := left.(*v1.VolumeSnapshot) if !ok { return false } - rightSnapshot, ok := right.(*v1beta1.VolumeSnapshot) + rightSnapshot, ok := right.(*v1.VolumeSnapshot) if !ok { return false } @@ -74,7 +74,7 @@ func (v *volumeSnapshotGetter) compare(left, right runtime.Object, field query.F } func (v *volumeSnapshotGetter) filter(object runtime.Object, filter query.Filter) bool { - snapshot, ok := object.(*v1beta1.VolumeSnapshot) + snapshot, ok := object.(*v1.VolumeSnapshot) if !ok { return false } @@ -93,7 +93,7 @@ func (v *volumeSnapshotGetter) filter(object runtime.Object, filter query.Filter } } -func snapshotStatus(item *v1beta1.VolumeSnapshot) string { +func snapshotStatus(item *v1.VolumeSnapshot) string { status := statusCreating if item != nil && item.Status != nil && item.Status.ReadyToUse != nil && *item.Status.ReadyToUse { status = statusReady diff --git a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go index b6cfa27b5..d2cd74094 100644 --- a/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go +++ b/pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1" - "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake" - "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions" + snapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1" + "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake" + "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,7 +33,7 @@ import ( const ( baseVolumeSnapshot = `{ - "apiVersion": "snapshot.storage.k8s.io/v1beta1", + "apiVersion": "snapshot.storage.k8s.io/v1", "kind": "VolumeSnapshot", "metadata": { "creationTimestamp": "2020-04-29T06:52:06Z", @@ -45,7 +45,7 @@ const ( "name": "snap-1", "namespace": "default", "resourceVersion": "5027277", - "selfLink": "/apis/snapshot.storage.k8s.io/v1beta1/namespaces/default/volumesnapshots/snap-1", + "selfLink": "/apis/snapshot.storage.k8s.io/v1/namespaces/default/volumesnapshots/snap-1", "uid": "dc66842d-17bf-4087-a8e8-7592d129a956" }, "spec": { @@ -64,8 +64,8 @@ const ( defaultNamespace = "default" ) -func newVolumeSnapshot(name string) *v1beta1.VolumeSnapshot { - volumeSnapshot := &v1beta1.VolumeSnapshot{} +func newVolumeSnapshot(name string) *snapshotv1.VolumeSnapshot { + volumeSnapshot := &snapshotv1.VolumeSnapshot{} err := json.Unmarshal([]byte(baseVolumeSnapshot), volumeSnapshot) if err != nil { return nil @@ -100,7 +100,7 @@ func TestListVolumeSnapshot(t *testing.T) { volumeSnapshots := []interface{}{snapshot1, snapshot2, snapshot3} for _, s := range volumeSnapshots { - _ = informer.Snapshot().V1beta1().VolumeSnapshots().Informer().GetIndexer().Add(s) + _ = informer.Snapshot().V1().VolumeSnapshots().Informer().GetIndexer().Add(s) } getter := New(informer) @@ -151,9 +151,9 @@ func TestListVolumeSnapshot(t *testing.T) { snapshotList, err := getter.List(defaultNamespace, query1) Expect(err).To(BeNil()) Expect(snapshotList.TotalItems).To(Equal(3)) - Expect(snapshotList.Items[0].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot3.Name)) - Expect(snapshotList.Items[1].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot2.Name)) - Expect(snapshotList.Items[2].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot1.Name)) + Expect(snapshotList.Items[0].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot3.Name)) + Expect(snapshotList.Items[1].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot2.Name)) + Expect(snapshotList.Items[2].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot1.Name)) }) It("by name", func() { @@ -163,9 +163,9 @@ func TestListVolumeSnapshot(t *testing.T) { snapshotList, err := getter.List(defaultNamespace, query1) Expect(err).To(BeNil()) Expect(snapshotList.TotalItems).To(Equal(3)) - Expect(snapshotList.Items[0].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot1.Name)) - Expect(snapshotList.Items[1].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot2.Name)) - Expect(snapshotList.Items[2].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot3.Name)) + Expect(snapshotList.Items[0].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot1.Name)) + Expect(snapshotList.Items[1].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot2.Name)) + Expect(snapshotList.Items[2].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot3.Name)) }) It("by name and reverse", func() { query1 := query.New() @@ -174,9 +174,9 @@ func TestListVolumeSnapshot(t *testing.T) { snapshotList, err := getter.List(defaultNamespace, query1) Expect(err).To(BeNil()) Expect(snapshotList.TotalItems).To(Equal(3)) - Expect(snapshotList.Items[0].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot3.Name)) - Expect(snapshotList.Items[1].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot2.Name)) - Expect(snapshotList.Items[2].(*v1beta1.VolumeSnapshot).Name).To(Equal(snapshot1.Name)) + Expect(snapshotList.Items[0].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot3.Name)) + Expect(snapshotList.Items[1].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot2.Name)) + Expect(snapshotList.Items[2].(*snapshotv1.VolumeSnapshot).Name).To(Equal(snapshot1.Name)) }) }) @@ -190,14 +190,14 @@ func TestListVolumeSnapshot(t *testing.T) { Expect(snapshotStatus(snapshot)).To(Equal(statusCreating)) }) It("snapshot.Status.ReadyToUse == nil", func() { - snapshot.Status = &v1beta1.VolumeSnapshotStatus{ + snapshot.Status = &snapshotv1.VolumeSnapshotStatus{ ReadyToUse: nil, } Expect(snapshotStatus(snapshot)).To(Equal(statusCreating)) }) It("snapshot.Status.ReadyToUse == false", func() { readyToUse := false - snapshot.Status = &v1beta1.VolumeSnapshotStatus{ + snapshot.Status = &snapshotv1.VolumeSnapshotStatus{ ReadyToUse: &readyToUse, } Expect(snapshotStatus(snapshot)).To(Equal(statusCreating)) @@ -205,7 +205,7 @@ func TestListVolumeSnapshot(t *testing.T) { It("snapshot.Status.ReadyToUse == true", func() { readyToUse := true - snapshot.Status = &v1beta1.VolumeSnapshotStatus{ + snapshot.Status = &snapshotv1.VolumeSnapshotStatus{ ReadyToUse: &readyToUse, } Expect(snapshotStatus(snapshot)).To(Equal(statusReady)) diff --git a/pkg/simple/client/k8s/fake_client.go b/pkg/simple/client/k8s/fake_client.go index 0e117b194..e6dc6c03c 100644 --- a/pkg/simple/client/k8s/fake_client.go +++ b/pkg/simple/client/k8s/fake_client.go @@ -17,7 +17,7 @@ limitations under the License. package k8s import ( - snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned" + snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" istioclient "istio.io/client-go/pkg/clientset/versioned" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/pkg/simple/client/k8s/kubernetes.go b/pkg/simple/client/k8s/kubernetes.go index 2c2e378a3..178c5eca3 100644 --- a/pkg/simple/client/k8s/kubernetes.go +++ b/pkg/simple/client/k8s/kubernetes.go @@ -19,7 +19,7 @@ package k8s import ( "strings" - snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned" + snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" istioclient "istio.io/client-go/pkg/clientset/versioned" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/pkg/simple/client/k8s/null_client.go b/pkg/simple/client/k8s/null_client.go index 34ce38bf1..940e2a4e8 100644 --- a/pkg/simple/client/k8s/null_client.go +++ b/pkg/simple/client/k8s/null_client.go @@ -17,7 +17,7 @@ limitations under the License. package k8s import ( - snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned" + snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" istio "istio.io/client-go/pkg/clientset/versioned" apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/vendor/modules.txt b/vendor/modules.txt index 00ab31b96..18b6ef3e0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -491,19 +491,24 @@ github.com/jszwec/csvutil github.com/kevinburke/ssh_config # github.com/konsorten/go-windows-terminal-sequences v1.0.2 => github.com/konsorten/go-windows-terminal-sequences v1.0.2 github.com/konsorten/go-windows-terminal-sequences -# github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0 => github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0 +# github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 ## explicit -github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1 -github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned -github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/fake -github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/scheme -github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/typed/volumesnapshot/v1beta1 -github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/typed/volumesnapshot/v1beta1/fake -github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions -github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions/internalinterfaces -github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions/volumesnapshot -github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions/volumesnapshot/v1beta1 -github.com/kubernetes-csi/external-snapshotter/client/v3/listers/volumesnapshot/v1beta1 +github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1 +github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1beta1 +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/fake +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/scheme +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1 +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1/fake +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1beta1 +github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned/typed/volumesnapshot/v1beta1/fake +github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions +github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions/internalinterfaces +github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions/volumesnapshot +github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions/volumesnapshot/v1 +github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions/volumesnapshot/v1beta1 +github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1 +github.com/kubernetes-csi/external-snapshotter/client/v4/listers/volumesnapshot/v1beta1 # github.com/kubesphere/sonargo v0.0.2 => github.com/kubesphere/sonargo v0.0.2 ## explicit github.com/kubesphere/sonargo/sonar