github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

refactor: Simplify the code logic.

Browse Source
This commit is contained in:
zhifei92 2024-12-03 20:31:09 +08:00
parent 810e9e212e
commit cb74323e07
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/framework/pod/wait.go
View File

@ -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 { func WaitForPodContainerStarted(ctx context.Context, c clientset.Interface, namespace, podName string, containerIndex int, timeout time.Duration) error {
conditionDesc := fmt.Sprintf("container %d started", containerIndex) conditionDesc := fmt.Sprintf("container %d started", containerIndex)
return WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) { 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 return false, nil
} }
containerStatus := pod.Status.ContainerStatuses[containerIndex] 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 { 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) conditionDesc := fmt.Sprintf("init container %d started", initContainerIndex)
return WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) { 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 return false, nil
} }
initContainerStatus := pod.Status.InitContainerStatuses[initContainerIndex] initContainerStatus := pod.Status.InitContainerStatuses[initContainerIndex]

4
test/e2e_node/util.go
View File

@ -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 { 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) conditionDesc := fmt.Sprintf("init container %d started", initContainerIndex)
return e2epod.WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) { 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 return false, nil
} }
containerStatus := pod.Status.InitContainerStatuses[initContainerIndex] 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 { 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) conditionDesc := fmt.Sprintf("container %d started", containerIndex)
return e2epod.WaitForPodCondition(ctx, c, namespace, podName, conditionDesc, timeout, func(pod *v1.Pod) (bool, error) { 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 return false, nil
} }
containerStatus := pod.Status.ContainerStatuses[containerIndex] containerStatus := pod.Status.ContainerStatuses[containerIndex]