test/e2e: multik8s: use CreatePVC instead of ApplyPVCTemplate

Signed-off-by: Ryotaro Banno <[email protected]>
cybozu-go · Jan 20, 2025 · 11ec828 · 11ec828
1 parent 2220184
commit 11ec828
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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())
 }