diff --git a/e2e/cephfs.go b/e2e/cephfs.go index 44b148856..19a1e6b54 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -227,7 +227,7 @@ var _ = Describe(cephfsType, func() { logsCSIPods("app=csi-cephfsplugin", c) // log all details from the namespace where Ceph-CSI is deployed - e2edebug.DumpAllNamespaceInfo(c, cephCSINamespace) + e2edebug.DumpAllNamespaceInfo(context.TODO(), c, cephCSINamespace) } err := deleteConfigMap(cephFSDirPath) if err != nil { diff --git a/e2e/log.go b/e2e/log.go index aefcabf46..6677d1f42 100644 --- a/e2e/log.go +++ b/e2e/log.go @@ -46,7 +46,7 @@ func logsCSIPods(label string, c clientset.Interface) { func kubectlLogPod(c clientset.Interface, pod *v1.Pod) { container := pod.Spec.Containers for i := range container { - logs, err := frameworkPod.GetPodLogs(c, pod.Namespace, pod.Name, container[i].Name) + logs, err := frameworkPod.GetPodLogs(context.TODO(), c, pod.Namespace, pod.Name, container[i].Name) if err != nil { logs, err = getPreviousPodLogs(c, pod.Namespace, pod.Name, container[i].Name) if err != nil { diff --git a/e2e/nfs.go b/e2e/nfs.go index d1790d269..3632c61c2 100644 --- a/e2e/nfs.go +++ b/e2e/nfs.go @@ -294,7 +294,7 @@ var _ = Describe("nfs", func() { logsCSIPods("app=csi-nfsplugin", c) // log all details from the namespace where Ceph-CSI is deployed - e2edebug.DumpAllNamespaceInfo(c, cephCSINamespace) + e2edebug.DumpAllNamespaceInfo(context.TODO(), c, cephCSINamespace) } err := deleteConfigMap(nfsDirPath) if err != nil { diff --git a/e2e/node.go b/e2e/node.go index 5b0924128..180eaa596 100644 --- a/e2e/node.go +++ b/e2e/node.go @@ -60,7 +60,7 @@ func checkNodeHasLabel(c kubernetes.Interface, labelKey, labelValue string) erro return fmt.Errorf("failed to list node: %w", err) } for i := range nodes.Items { - e2enode.ExpectNodeHasLabel(c, nodes.Items[i].Name, labelKey, labelValue) + e2enode.ExpectNodeHasLabel(context.TODO(), c, nodes.Items[i].Name, labelKey, labelValue) } return nil diff --git a/e2e/pvc.go b/e2e/pvc.go index f021e208e..8ad63c7dc 100644 --- a/e2e/pvc.go +++ b/e2e/pvc.go @@ -89,6 +89,7 @@ func createPVCAndvalidatePV(c kubernetes.Interface, pvc *v1.PersistentVolumeClai return false, fmt.Errorf("failed to get pv: %w", err) } err = e2epv.WaitOnPVandPVC( + context.TODO(), c, &framework.TimeoutContext{ClaimBound: timeout, PVBound: timeout}, namespace, diff --git a/e2e/rbd.go b/e2e/rbd.go index eae8ed8c2..eb14a545d 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -355,7 +355,7 @@ var _ = Describe("RBD", func() { logsCSIPods("app=csi-rbdplugin", c) // log all details from the namespace where Ceph-CSI is deployed - e2edebug.DumpAllNamespaceInfo(c, cephCSINamespace) + e2edebug.DumpAllNamespaceInfo(context.TODO(), c, cephCSINamespace) } err := deleteConfigMap(rbdDirPath) @@ -596,7 +596,7 @@ var _ = Describe("RBD", func() { validateRBDImageCount(f, 1, defaultRBDPool) validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType) // create namespace for reattach PVC, deletion will be taken care by framework - ns, err := f.CreateNamespace(reattachPVCNamespace, nil) + ns, err := f.CreateNamespace(context.TODO(), reattachPVCNamespace, nil) if err != nil { framework.Failf("failed to create namespace: %v", err) } diff --git a/e2e/upgrade-cephfs.go b/e2e/upgrade-cephfs.go index 0e7cb171c..dd8fc0b34 100644 --- a/e2e/upgrade-cephfs.go +++ b/e2e/upgrade-cephfs.go @@ -125,7 +125,7 @@ var _ = Describe("CephFS Upgrade Testing", func() { logsCSIPods("app=csi-cephfsplugin", c) // log all details from the namespace where Ceph-CSI is deployed - e2edebug.DumpAllNamespaceInfo(c, cephCSINamespace) + e2edebug.DumpAllNamespaceInfo(context.TODO(), c, cephCSINamespace) } err = deleteConfigMap(cephFSDirPath) if err != nil { diff --git a/e2e/upgrade-rbd.go b/e2e/upgrade-rbd.go index bb3ba0fd0..0ed21e544 100644 --- a/e2e/upgrade-rbd.go +++ b/e2e/upgrade-rbd.go @@ -130,7 +130,7 @@ var _ = Describe("RBD Upgrade Testing", func() { logsCSIPods("app=csi-rbdplugin", c) // log all details from the namespace where Ceph-CSI is deployed - e2edebug.DumpAllNamespaceInfo(c, cephCSINamespace) + e2edebug.DumpAllNamespaceInfo(context.TODO(), c, cephCSINamespace) } err := deleteConfigMap(rbdDirPath)