Merge pull request #3768 from k8s-infra-cherrypick-robot/cherry-pick-3761-to-release-1.10

k8s-ci-robot · web-flow · commit 97ea30d1fc1f · 2023-07-27T08:12:08.000-07:00
[release-1.10] add machine pool wait to default e2e parameters
diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -328,6 +328,7 @@ func createApplyClusterTemplateInput(specName string, changes ...func(*clusterct
 		WaitForClusterIntervals:      e2eConfig.GetIntervals(specName, "wait-cluster"),
 		WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
 		WaitForMachineDeployments:    e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
+		WaitForMachinePools:          e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),
 		CNIManifestPath:              "",
 	}
 	for _, change := range changes {

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,7 @@ func createApplyClusterTemplateInput(specName string, changes ...func(*clusterct`
`328`	`328`	`WaitForClusterIntervals: e2eConfig.GetIntervals(specName, "wait-cluster"),`
`329`	`329`	`WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),`
`330`	`330`	`WaitForMachineDeployments: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),`
	`331`	`+ WaitForMachinePools: e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),`
`331`	`332`	`CNIManifestPath: "",`
`332`	`333`	`}`
`333`	`334`	`for _, change := range changes {`