admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4205 from f10atin9/update_csiDriver

Browse Source 
Update csi driver apiVersion
This commit is contained in:
KubeSphere CI Bot
2021-09-09 11:33:15 +08:00
committed by GitHub
parent b0506c35a4 22b77960c9
commit ff8df62b88
85 changed files with 2894 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apiserver/apiserver.go
View File

@@ -511,9 +511,9 @@ func (s *APIServer) waitForResourceSync(ctx context.Context) error {
snapshotInformerFactory := s.InformerFactory.SnapshotSharedInformerFactory()
snapshotGVRs := []schema.GroupVersionResource{
{Group: "snapshot.storage.k8s.io", Version: "v1beta1", Resource: "volumesnapshotclasses"},
{Group: "snapshot.storage.k8s.io", Version: "v1beta1", Resource: "volumesnapshots"},
{Group: "snapshot.storage.k8s.io", Version: "v1beta1", Resource: "volumesnapshotcontents"},
{Group: "snapshot.storage.k8s.io", Version: "v1", Resource: "volumesnapshotclasses"},
{Group: "snapshot.storage.k8s.io", Version: "v1", Resource: "volumesnapshots"},
{Group: "snapshot.storage.k8s.io", Version: "v1", Resource: "volumesnapshotcontents"},
}
for _, gvr := range snapshotGVRs {
if !isResourceExists(gvr) {

6
pkg/controller/storage/capability/capability_controller.go
View File

@@ -25,8 +25,6 @@ import (
"time"
"k8s.io/apimachinery/pkg/labels"
storageinformersv1beta1 "k8s.io/client-go/informers/storage/v1beta1"
storagelistersv1beta1 "k8s.io/client-go/listers/storage/v1beta1"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -53,7 +51,7 @@ type StorageCapabilityController struct {
storageClassLister storagelistersv1.StorageClassLister
storageClassSynced cache.InformerSynced
csiDriverLister storagelistersv1beta1.CSIDriverLister
csiDriverLister storagelistersv1.CSIDriverLister
csiDriverSynced cache.InformerSynced
storageClassWorkQueue workqueue.RateLimitingInterface
@@ -64,7 +62,7 @@ type StorageCapabilityController struct {
func NewController(
storageClassClient storageclient.StorageClassInterface,
storageClassInformer storageinformersv1.StorageClassInformer,
csiDriverInformer storageinformersv1beta1.CSIDriverInformer,
csiDriverInformer storageinformersv1.CSIDriverInformer,
) *StorageCapabilityController {
utilruntime.Must(crdscheme.AddToScheme(scheme.Scheme))

15
pkg/controller/storage/capability/capability_controller_test.go
View File

@@ -19,13 +19,12 @@
package capability
import (
"github.com/google/go-cmp/cmp"
"k8s.io/api/storage/v1beta1"
"reflect"
"testing"
"time"
"github.com/google/go-cmp/cmp"
storagev1 "k8s.io/api/storage/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
@@ -53,7 +52,7 @@ type fixture struct {
storageObjects []runtime.Object // include StorageClass
// Objects to put in the store.
storageClassLister []*storagev1.StorageClass
csiDriverLister []*v1beta1.CSIDriver
csiDriverLister []*storagev1.CSIDriver
// Actions expected to happen on the client.
actions []core.Action
}
@@ -74,14 +73,14 @@ func (f *fixture) newController() (*StorageCapabilityController,
c := NewController(
f.k8sClient.StorageV1().StorageClasses(),
k8sInformers.Storage().V1().StorageClasses(),
k8sInformers.Storage().V1beta1().CSIDrivers(),
k8sInformers.Storage().V1().CSIDrivers(),
)
for _, storageClass := range f.storageClassLister {
_ = k8sInformers.Storage().V1().StorageClasses().Informer().GetIndexer().Add(storageClass)
}
for _, csiDriver := range f.csiDriverLister {
_ = k8sInformers.Storage().V1beta1().CSIDrivers().Informer().GetIndexer().Add(csiDriver)
_ = k8sInformers.Storage().V1().CSIDrivers().Informer().GetIndexer().Add(csiDriver)
}
return c, k8sInformers
@@ -197,8 +196,8 @@ func newStorageClass(name string, provisioner string) *storagev1.StorageClass {
}
}
func newCSIDriver(name string) *v1beta1.CSIDriver {
return &v1beta1.CSIDriver{
func newCSIDriver(name string) *storagev1.CSIDriver {
return &storagev1.CSIDriver{
ObjectMeta: v1.ObjectMeta{
Name: name,
},

12
pkg/controller/storage/snapshotclass/snapshotclass_controller.go
View File

@@ -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{})
}

52
pkg/controller/storage/snapshotclass/snapshotclass_controller_test.go
View File

@@ -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,24 +65,24 @@ 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 {
_ = 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
@@ -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,9 +194,9 @@ 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,
},
@@ -204,17 +204,17 @@ func newStorageClass(name string) *storagev1.StorageClass {
}
}
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)

4
pkg/informers/informers.go
View File

@@ -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"

2
pkg/informers/null_informers.go
View File

@@ -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"

2
pkg/kapis/monitoring/v1alpha3/helper_test.go
View File

@@ -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"

2
pkg/kapis/resources/v1alpha3/handler_test.go
View File

@@ -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"

2
pkg/models/resources/v1alpha2/persistentvolumeclaim/persistentvolumeclaims.go
View File

@@ -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"

2
pkg/models/resources/v1alpha2/resource/resource_test.go
View File

@@ -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"

2
pkg/models/resources/v1alpha2/storageclass/storageclasses.go
View File

@@ -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"

4
pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim.go
View File

@@ -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
}

8
pkg/models/resources/v1alpha3/persistentvolumeclaim/persistentvolumeclaim_test.go
View File

@@ -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)

4
pkg/models/resources/v1alpha3/resource/resource.go
View File

@@ -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"
@@ -114,7 +114,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: "", Version: "v1", Resource: "nodes"}] = node.New(factory.KubernetesSharedInformerFactory())

2
pkg/models/resources/v1alpha3/resource/resource_test.go
View File

@@ -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"

16
pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot.go
View File

@@ -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

40
pkg/models/resources/v1alpha3/volumesnapshot/volumesnapshot_test.go
View File

@@ -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))

2
pkg/simple/client/k8s/fake_client.go
View File

@@ -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"

2
pkg/simple/client/k8s/kubernetes.go
View File

@@ -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"

2
pkg/simple/client/k8s/null_client.go
View File

@@ -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"