github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110640 from aspsk/aspsk/pr/fix-test-e2e-network-hostport

Browse Source 
test/e2e/network: fix a bug in the hostport e2e test
This commit is contained in:
Kubernetes Prow Robot 2022-06-19 06:54:03 -07:00 committed by GitHub
commit 3724273d38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ var _ = common.SIGDescribe("HostPort", func() {
// IPv6 doesn't NAT from localhost -> localhost, it doesn't have the route_localnet kernel hack, so we need to specify the source IP
cmdPod1 := []string{"/bin/sh", "-c", fmt.Sprintf("curl -g --connect-timeout %v --interface %s http://%s/hostname", timeout, hostIP, net.JoinHostPort(localhost, 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("echo hostname | nc -u -w %v %s %d", timeout, hostIP, port)}
// try 5 times to connect to the exposed ports
for i := 0; i < 5; i++ {
// check pod1
@ -143,11 +143,19 @@ var _ = common.SIGDescribe("HostPort", func() {
}
// check pod3
ginkgo.By(fmt.Sprintf("checking connectivity from pod %s to serverIP: %s, port: %d UDP", hostExecPod.Name, hostIP, port))
_, _, err = f.ExecCommandInContainerWithFullOutput(hostExecPod.Name, "e2e-host-exec", cmdPod3...)
hostname3, _, err := f.ExecCommandInContainerWithFullOutput(hostExecPod.Name, "e2e-host-exec", cmdPod3...)
if err != nil {
framework.Logf("Can not connect from %s to pod(pod2) to serverIP: %s, port: %d", hostExecPod.Name, hostIP, port)
continue
}
if hostname1 == hostname3 {
framework.Logf("pods must have different hostname: pod1 has hostname %s, pod3 has hostname %s", hostname1, hostname3)
continue
}
if hostname2 == hostname3 {
framework.Logf("pods must have different hostname: pod2 has hostname %s, pod3 has hostname %s", hostname2, hostname3)
continue
}
return
}
framework.Failf("Failed to connect to exposed host ports")
@ -157,6 +165,18 @@ var _ = common.SIGDescribe("HostPort", func() {
// create pod which using hostport on the specified node according to the nodeSelector
// it starts an http server on the exposed port
func createHostPortPodOnNode(f *framework.Framework, podName, ns, hostIP string, port int32, protocol v1.Protocol, nodeName string) {
var netexecArgs []string
var readinessProbePort int32
if protocol == v1.ProtocolTCP {
readinessProbePort = 8080
netexecArgs = []string{"--http-port=8080", "--udp-port=-1"}
} else {
readinessProbePort = 8008
netexecArgs = []string{"--http-port=8008", "--udp-port=8080"}
}
hostPortPod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: podName,
@ -166,7 +186,7 @@ func createHostPortPodOnNode(f *framework.Framework, podName, ns, hostIP string,
{
Name: "agnhost",
Image: imageutils.GetE2EImage(imageutils.Agnhost),
Args: []string{"netexec", "--http-port=8080", "--udp-port=8080"},
Args: append([]string{"netexec"}, netexecArgs...),
Ports: []v1.ContainerPort{
{
HostPort: port,
@ -180,7 +200,7 @@ func createHostPortPodOnNode(f *framework.Framework, podName, ns, hostIP string,
HTTPGet: &v1.HTTPGetAction{
Path: "/hostname",
Port: intstr.IntOrString{
IntVal: int32(8080),
IntVal: readinessProbePort,
},
Scheme: v1.URISchemeHTTP,
},

2
test/images/agnhost/netexec/netexec.go
View File

@ -634,7 +634,7 @@ func redirectHandler(w http.ResponseWriter, r *http.Request) {
// udp server supports the hostName, echo and clientIP commands.
func startUDPServer(address string, udpPort int) {
serverAddress, err := net.ResolveUDPAddr("udp", net.JoinHostPort(address, strconv.Itoa(udpPort)))
assertNoError(err, fmt.Sprintf("failed to resolve UDP address for port %d", sctpPort))
assertNoError(err, fmt.Sprintf("failed to resolve UDP address for port %d", udpPort))
serverConn, err := net.ListenUDP("udp", serverAddress)
assertNoError(err, fmt.Sprintf("failed to create listener for UDP address %v", serverAddress))
defer serverConn.Close()