mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: Pass context.TODO() to kubernetes snapshot client

Browse Source 
in external-snapshotter the client has changed we
need to pass the context to snapshot api calls.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-05-05 09:18:52 +05:30 committed by mergify[bot]
parent 1f13692000
commit 76a55350aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
e2e/snapshot.go
View File

@ -1,6 +1,7 @@
package e2e package e2e
import ( import (
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings" "strings"
@ -57,7 +58,7 @@ func createSnapshot(snap *snapapi.VolumeSnapshot, t int) error {
if err != nil { if err != nil {
return err return err
} }
_, err = sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Create(snap) _, err = sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Create(context.TODO(), snap, metav1.CreateOptions{})
if err != nil { if err != nil {
return err return err
} }
@ -70,7 +71,7 @@ func createSnapshot(snap *snapapi.VolumeSnapshot, t int) error {
return wait.PollImmediate(poll, timeout, func() (bool, error) { return wait.PollImmediate(poll, timeout, func() (bool, error) {
e2elog.Logf("waiting for snapshot %s (%d seconds elapsed)", snap.Name, int(time.Since(start).Seconds())) e2elog.Logf("waiting for snapshot %s (%d seconds elapsed)", snap.Name, int(time.Since(start).Seconds()))
snaps, err := sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Get(name, metav1.GetOptions{}) snaps, err := sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil { if err != nil {
e2elog.Logf("Error getting snapshot in namespace: '%s': %v", snap.Namespace, err) e2elog.Logf("Error getting snapshot in namespace: '%s': %v", snap.Namespace, err)
if testutils.IsRetryableAPIError(err) { if testutils.IsRetryableAPIError(err) {
@ -97,7 +98,7 @@ func deleteSnapshot(snap *snapapi.VolumeSnapshot, t int) error {
if err != nil { if err != nil {
return err return err
} }
err = sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Delete(snap.Name, &metav1.DeleteOptions{}) err = sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Delete(context.TODO(), snap.Name, metav1.DeleteOptions{})
if err != nil { if err != nil {
return err return err
} }
@ -109,7 +110,7 @@ func deleteSnapshot(snap *snapapi.VolumeSnapshot, t int) error {
return wait.PollImmediate(poll, timeout, func() (bool, error) { return wait.PollImmediate(poll, timeout, func() (bool, error) {
e2elog.Logf("deleting snapshot %s (%d seconds elapsed)", name, int(time.Since(start).Seconds())) e2elog.Logf("deleting snapshot %s (%d seconds elapsed)", name, int(time.Since(start).Seconds()))
_, err := sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Get(name, metav1.GetOptions{}) _, err := sclient.SnapshotV1beta1().VolumeSnapshots(snap.Namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err == nil { if err == nil {
return false, nil return false, nil
} }
@ -151,6 +152,6 @@ func createRBDSnapshotClass(f *framework.Framework) {
sc.Parameters["clusterID"] = fsID sc.Parameters["clusterID"] = fsID
sclient, err := newSnapshotClient() sclient, err := newSnapshotClient()
Expect(err).Should(BeNil()) Expect(err).Should(BeNil())
_, err = sclient.SnapshotV1beta1().VolumeSnapshotClasses().Create(&sc) _, err = sclient.SnapshotV1beta1().VolumeSnapshotClasses().Create(context.TODO(), &sc, metav1.CreateOptions{})
Expect(err).Should(BeNil()) Expect(err).Should(BeNil())
} }