Merge pull request kubernetes#129070 from zhifei92/fix-typo

e2e_node: Simplify the code logic

Author: k8s-ci-robot

test/e2e/framework/pod/wait.go

@@ -801,7 +801,7 @@ func WaitForPodScheduled(ctx context.Context, c clientset.Interface, namespace,
 func WaitForPodContainerStarted(ctx context.Context, c clientset.Interface, namespace, podName string, containerIndex int, timeout time.Duration) error {
 	conditionDesc := fmt.Sprintf("container %d started", containerIndex)
 	return WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) {
-		if containerIndex > len(pod.Status.ContainerStatuses)-1 {
+		if containerIndex >= len(pod.Status.ContainerStatuses) {
 			return false, nil
 		}
 		containerStatus := pod.Status.ContainerStatuses[containerIndex]
@@ -813,7 +813,7 @@ func WaitForPodContainerStarted(ctx context.Context, c clientset.Interface, name
 func WaitForPodInitContainerStarted(ctx context.Context, c clientset.Interface, namespace, podName string, initContainerIndex int, timeout time.Duration) error {
 	conditionDesc := fmt.Sprintf("init container %d started", initContainerIndex)
 	return WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) {
-		if initContainerIndex > len(pod.Status.InitContainerStatuses)-1 {
+		if initContainerIndex >= len(pod.Status.InitContainerStatuses) {
 			return false, nil
 		}
 		initContainerStatus := pod.Status.InitContainerStatuses[initContainerIndex]

test/e2e_node/util.go

@@ -577,7 +577,7 @@ func getPidFromPidFile(pidFile string) (int, error) {
 func WaitForPodInitContainerRestartCount(ctx context.Context, c clientset.Interface, namespace, podName string, initContainerIndex int, desiredRestartCount int32, timeout time.Duration) error {
 	conditionDesc := fmt.Sprintf("init container %d started", initContainerIndex)
 	return e2epod.WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) {
-		if initContainerIndex > len(pod.Status.InitContainerStatuses)-1 {
+		if initContainerIndex >= len(pod.Status.InitContainerStatuses) {
 			return false, nil
 		}
 		containerStatus := pod.Status.InitContainerStatuses[initContainerIndex]
@@ -590,7 +590,7 @@ func WaitForPodInitContainerRestartCount(ctx context.Context, c clientset.Interf
 func WaitForPodContainerRestartCount(ctx context.Context, c clientset.Interface, namespace, podName string, containerIndex int, desiredRestartCount int32, timeout time.Duration) error {
 	conditionDesc := fmt.Sprintf("container %d started", containerIndex)
 	return e2epod.WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) {
-		if containerIndex > len(pod.Status.ContainerStatuses)-1 {
+		if containerIndex >= len(pod.Status.ContainerStatuses) {
 			return false, nil
 		}
 		containerStatus := pod.Status.ContainerStatuses[containerIndex]