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

remove snapshotter v3

Browse Source 
Signed-off-by: f10atin9 <f10atin9@kubesphere.io>
This commit is contained in:
f10atin9
2021-09-02 14:58:38 +08:00
parent 8e4d729f79
commit a82617af5f
19 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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