Skip to content

Commit e023a17

Browse files
committed
util name fix
1 parent 69f3d47 commit e023a17

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

tests/e2e/k8testutil/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7330,10 +7330,10 @@ func ExitHostMM(ctx context.Context, host *object.HostSystem, timeout int32) {
73307330
}
73317331

73327332
/*
7333-
createStafeulSetAndVerifyPVAndPodNodeAffinty creates user specified statefulset and
7333+
CreateStatefulSetAndVerifyPVAndPodNodeAffinty creates user specified statefulset and
73347334
further checks the node and volumes affinities
73357335
*/
7336-
func CreateStafeulSetAndVerifyPVAndPodNodeAffinty(ctx context.Context, client clientset.Interface,
7336+
func CreateStatefulSetAndVerifyPVAndPodNodeAffinty(ctx context.Context, client clientset.Interface,
73377337
vs *config.E2eTestConfig, namespace string, parallelPodPolicy bool, replicas int32, nodeAffinityToSet bool,
73387338
allowedTopologies []v1.TopologySelectorLabelRequirement,
73397339
podAntiAffinityToSet bool, parallelStatefulSetCreation bool, modifyStsSpec bool,

tests/e2e/multiSvc/multi_svc_test.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ var _ = ginkgo.Describe("[csi-multi-svc] Multi-SVC", func() {
261261
}
262262

263263
ginkgo.By("Create StatefulSet with 3 replicas with parallel pod management")
264-
service, statefulset, err := k8testutil.CreateStafeulSetAndVerifyPVAndPodNodeAffinty(ctx, client,
264+
service, statefulset, err := k8testutil.CreateStatefulSetAndVerifyPVAndPodNodeAffinty(ctx, client,
265265
e2eTestConfig, namespace, true, 3, false, nil, false, false, true, "", nil, false,
266266
storagePolicyNames[n])
267267
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -272,14 +272,14 @@ var _ = ginkgo.Describe("[csi-multi-svc] Multi-SVC", func() {
272272

273273
framework.Logf("Scale up sts replica count to 5")
274274
scaleUpReplicaCount = 5
275-
err = k8testutil.ScaleUpStatefulSetPod(ctx, client, e2eTestConfig, statefulset, namespace, scaleUpReplicaCount,
276-
true)
275+
err = k8testutil.ScaleUpStatefulSetPod(ctx, client, e2eTestConfig, statefulset, namespace,
276+
scaleUpReplicaCount, true)
277277
gomega.Expect(err).NotTo(gomega.HaveOccurred())
278278

279279
framework.Logf("Scale down sts replica count to 1")
280280
scaleDownReplicaCount = 1
281-
err = k8testutil.ScaleDownStatefulSetPod(ctx, e2eTestConfig, client, statefulset, namespace, scaleDownReplicaCount,
282-
true)
281+
err = k8testutil.ScaleDownStatefulSetPod(ctx, e2eTestConfig, client, statefulset, namespace,
282+
scaleDownReplicaCount, true)
283283
gomega.Expect(err).NotTo(gomega.HaveOccurred())
284284

285285
}
@@ -319,7 +319,7 @@ var _ = ginkgo.Describe("[csi-multi-svc] Multi-SVC", func() {
319319
}
320320

321321
ginkgo.By("Create StatefulSet with 3 replicas with parallel pod management")
322-
service, statefulset, err := k8testutil.CreateStafeulSetAndVerifyPVAndPodNodeAffinty(ctx, client,
322+
service, statefulset, err := k8testutil.CreateStatefulSetAndVerifyPVAndPodNodeAffinty(ctx, client,
323323
e2eTestConfig, namespace, true, 3, false, nil, false, false, true, "", nil, false,
324324
storagePolicyNames[i])
325325
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -337,8 +337,8 @@ var _ = ginkgo.Describe("[csi-multi-svc] Multi-SVC", func() {
337337
// scaling up/down sts created before password rotation
338338
framework.Logf("Scale up sts replica count to 5")
339339
scaleUpReplicaCount = 5
340-
err = k8testutil.ScaleUpStatefulSetPod(ctx, client, e2eTestConfig, statefulset, namespace, scaleUpReplicaCount,
341-
true)
340+
err = k8testutil.ScaleUpStatefulSetPod(ctx, client, e2eTestConfig, statefulset, namespace,
341+
scaleUpReplicaCount, true)
342342
gomega.Expect(err).NotTo(gomega.HaveOccurred())
343343

344344
framework.Logf("Scale down sts replica count to 1")
@@ -361,7 +361,8 @@ var _ = ginkgo.Describe("[csi-multi-svc] Multi-SVC", func() {
361361
var volHandle string
362362
pvclaims = append(pvclaims, pvclaim)
363363
ginkgo.By("Waiting for pvc to be in bound state")
364-
persistentvolumes, err := fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaims, framework.ClaimProvisionTimeout)
364+
persistentvolumes, err := fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaims,
365+
framework.ClaimProvisionTimeout)
365366
gomega.Expect(err).NotTo(gomega.HaveOccurred())
366367
pv := persistentvolumes[0]
367368
volHandle = pv.Spec.CSI.VolumeHandle
@@ -727,7 +728,7 @@ var _ = ginkgo.Describe("[csi-multi-svc] Multi-SVC", func() {
727728
}
728729

729730
ginkgo.By("Create StatefulSet with 3 replica with parallel pod management")
730-
service, statefulset, err := k8testutil.CreateStafeulSetAndVerifyPVAndPodNodeAffinty(ctx, client,
731+
service, statefulset, err := k8testutil.CreateStatefulSetAndVerifyPVAndPodNodeAffinty(ctx, client,
731732
e2eTestConfig, namespace, true, 3, false, nil, false, false, true, "", nil, false,
732733
storagePolicyNames[n])
733734
gomega.Expect(err).NotTo(gomega.HaveOccurred())

0 commit comments

Comments
 (0)