mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 08:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: make use of snapshot v1 api in cephfs_helper.go

Browse Source 
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2021-06-23 13:05:24 +05:30 committed by mergify[bot]
parent f3d400730e
commit 7823b360b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/cephfs_helper.go
View File

@ -7,7 +7,7 @@ import (
"regexp" "regexp"
"strings" "strings"
snapapi "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1" snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
@ -177,11 +177,11 @@ func getSnapName(snapNamespace, snapName string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
snap, err := sclient.SnapshotV1beta1().VolumeSnapshots(snapNamespace).Get(context.TODO(), snapName, metav1.GetOptions{}) snap, err := sclient.VolumeSnapshots(snapNamespace).Get(context.TODO(), snapName, metav1.GetOptions{})
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get volumesnapshot: %w", err) return "", fmt.Errorf("failed to get volumesnapshot: %w", err)
} }
sc, err := sclient.SnapshotV1beta1().VolumeSnapshotContents().Get(context.TODO(), *snap.Status.BoundVolumeSnapshotContentName, metav1.GetOptions{}) sc, err := sclient.VolumeSnapshotContents().Get(context.TODO(), *snap.Status.BoundVolumeSnapshotContentName, metav1.GetOptions{})
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get volumesnapshotcontent: %w", err) return "", fmt.Errorf("failed to get volumesnapshotcontent: %w", err)
} }