diff --git a/test/e2e/multik8s/changetoprimary/suite_test.go b/test/e2e/multik8s/changetoprimary/suite_test.go index c406517e..0e44aebc 100644 --- a/test/e2e/multik8s/changetoprimary/suite_test.go +++ b/test/e2e/multik8s/changetoprimary/suite_test.go @@ -87,9 +87,7 @@ func changePrimaryToStandaloneTemporarily() { pvcName1 = util.GetUniqueName("pvc-") backupName10 = util.GetUniqueName("mb-") - Eventually(func() error { - return ApplyPVCTemplate(PrimaryK8sCluster, namespace, pvcName1) - }).Should(Succeed()) + CreatePVC(ctx, PrimaryK8sCluster, namespace, pvcName1) writtenDataHash10 = WriteRandomDataToPV(ctx, PrimaryK8sCluster, namespace, pvcName1) CreateMantleBackup(PrimaryK8sCluster, namespace, pvcName1, backupName10) }) diff --git a/test/e2e/multik8s/testutil/util.go b/test/e2e/multik8s/testutil/util.go index 3c8aff1a..eb624297 100644 --- a/test/e2e/multik8s/testutil/util.go +++ b/test/e2e/multik8s/testutil/util.go @@ -117,7 +117,7 @@ func ApplyMantleRestoreTemplate(clusterNo int, namespace, restoreName, backupNam return nil } -func ApplyPVCTemplate(clusterNo int, namespace, name string) error { +func applyPVCTemplate(clusterNo int, namespace, name string) error { manifest := fmt.Sprintf(testPVCTemplate, name) _, _, err := Kubectl(clusterNo, []byte(manifest), "apply", "-n", namespace, "-f", "-") if err != nil { @@ -412,7 +412,7 @@ func SetupEnvironment(namespace string) { func CreatePVC(ctx context.Context, cluster int, namespace, name string) { Eventually(ctx, func() error { - return ApplyPVCTemplate(cluster, namespace, name) + return applyPVCTemplate(cluster, namespace, name) }).Should(Succeed()) }