github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

fix conflict hostPort e2e test

Browse Source
This commit is contained in:
jornshen 2021-02-16 18:49:45 +08:00
parent bcfa3a0a36
commit 6b8781cae6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/network/hostport.go
View File

@ -117,7 +117,6 @@ var _ = SIGDescribe("HostPort", func() {
cmdPod2 := []string{"/bin/sh", "-c", fmt.Sprintf("curl -g --connect-timeout %v http://%s/hostname", timeout, net.JoinHostPort(hostIP, strconv.Itoa(int(port))))} cmdPod2 := []string{"/bin/sh", "-c", fmt.Sprintf("curl -g --connect-timeout %v http://%s/hostname", timeout, net.JoinHostPort(hostIP, strconv.Itoa(int(port))))}
cmdPod3 := []string{"/bin/sh", "-c", fmt.Sprintf("nc -vuz -w %v %s %d", timeout, hostIP, port)} cmdPod3 := []string{"/bin/sh", "-c", fmt.Sprintf("nc -vuz -w %v %s %d", timeout, hostIP, port)}
// try 5 times to connect to the exposed ports // try 5 times to connect to the exposed ports
success := false
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
// check pod1 // check pod1
ginkgo.By(fmt.Sprintf("checking connectivity from pod %s to serverIP: %s, port: %d", hostExecPod.Name, localhost, port)) ginkgo.By(fmt.Sprintf("checking connectivity from pod %s to serverIP: %s, port: %d", hostExecPod.Name, localhost, port))
@ -145,11 +144,9 @@ var _ = SIGDescribe("HostPort", func() {
framework.Logf("Can not connect from %s to pod(pod2) to serverIP: %s, port: %d", hostExecPod.Name, hostIP, port) framework.Logf("Can not connect from %s to pod(pod2) to serverIP: %s, port: %d", hostExecPod.Name, hostIP, port)
continue continue
} }
success = true return
}
if !success {
framework.Failf("Failed to connect to exposed host ports")
} }
framework.Failf("Failed to connect to exposed host ports")
}) })
}) })
@ -190,9 +187,11 @@ func createHostPortPodOnNode(f *framework.Framework, podName, ns, hostIP string,
NodeName: nodeName, NodeName: nodeName,
}, },
} }
_, err := f.ClientSet.CoreV1().Pods(ns).Create(context.TODO(), hostPortPod, metav1.CreateOptions{}) if _, err := f.ClientSet.CoreV1().Pods(ns).Create(context.TODO(), hostPortPod, metav1.CreateOptions{}); err != nil {
framework.ExpectNoError(err) framework.Failf("error creating pod %s, err:%v", podName, err)
}
err = e2epod.WaitForPodNotPending(f.ClientSet, ns, podName) if err := e2epod.WaitTimeoutForPodReadyInNamespace(f.ClientSet, podName, ns, framework.PodStartTimeout); err != nil {
framework.ExpectNoError(err) framework.Failf("wait for pod %s timeout, err:%v", podName, err)
}
} }