From f6676a2c0e7af5c4a392cf23bb5e1468c12eb3ac Mon Sep 17 00:00:00 2001 From: Daman Arora Date: Thu, 18 Jul 2024 19:52:14 +0530 Subject: [PATCH 1/3] Revert "agnhost/netexec: log hostname" This reverts commit 90561cb9d9d9a2ce6696e7ffe6eaa11ef283975e. --- test/images/agnhost/netexec/netexec.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/images/agnhost/netexec/netexec.go b/test/images/agnhost/netexec/netexec.go index 689c4e42e6f..f1e2e62d536 100644 --- a/test/images/agnhost/netexec/netexec.go +++ b/test/images/agnhost/netexec/netexec.go @@ -727,7 +727,6 @@ func startSCTPServer(sctpPort int) { func getHostName() string { hostName, err := os.Hostname() - log.Printf("hostname: %s", hostName) assertNoError(err, "failed to get hostname") return hostName } From 4ea7be8fa6aab462d53798e22cfb7140cca23019 Mon Sep 17 00:00:00 2001 From: Daman Arora Date: Thu, 18 Jul 2024 19:53:41 +0530 Subject: [PATCH 2/3] Revert "e2e/network: dump iptables and conntrack flows for debugging" This reverts commit 3f2deb51ad8e42dddc5d8cbb4b109959d7f661bb. --- test/e2e/framework/network/utils.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/test/e2e/framework/network/utils.go b/test/e2e/framework/network/utils.go index dff4e1395c8..d0ada939f9a 100644 --- a/test/e2e/framework/network/utils.go +++ b/test/e2e/framework/network/utils.go @@ -364,27 +364,6 @@ func (config *NetworkingTestConfig) DialFromContainer(ctx context.Context, proto } framework.Logf("Dump network information for node %s:\n%s", node.Name, result) } - // Dump the node iptables rules and conntrack flows for troubleshooting #123760 - podList, _ := config.f.ClientSet.CoreV1().Pods("kube-system").List(ctx, metav1.ListOptions{ - LabelSelector: "k8s-app=kube-proxy", - }) - for _, pod := range podList.Items { - // dump only for the node running test-container-pod - if pod.Status.HostIP == config.TestContainerPod.Status.HostIP { - output, _, _ := e2epod.ExecWithOptions(config.f, e2epod.ExecOptions{ - Namespace: "kube-system", - PodName: pod.Name, - ContainerName: "kube-proxy", - Command: []string{"sh", "-c", fmt.Sprintf(`echo "IPTables Dump: " && iptables-save | grep "%s/%s:http" && echo "Conntrack flows: " && conntrack -Ln -p tcp | grep %d`, config.Namespace, config.NodePortService.Name, EndpointHTTPPort)}, - Stdin: nil, - CaptureStdout: true, - CaptureStderr: true, - PreserveWhitespace: false, - }) - framework.Logf("Dump iptables and connntrack flows\n%s", output) - break - } - } return returnMsg } From 6adac3bce1a1eb6db1cfa2ff870a5fed25aa440b Mon Sep 17 00:00:00 2001 From: Daman Arora Date: Thu, 18 Jul 2024 19:56:05 +0530 Subject: [PATCH 3/3] Revert "dump not network information on e2e failures" This reverts commit 9239e449506a82a40a29ede47d649f301ea0d8b0. --- test/e2e/framework/network/utils.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/test/e2e/framework/network/utils.go b/test/e2e/framework/network/utils.go index d0ada939f9a..2e8fb196c84 100644 --- a/test/e2e/framework/network/utils.go +++ b/test/e2e/framework/network/utils.go @@ -46,7 +46,6 @@ import ( e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" - storageutils "k8s.io/kubernetes/test/e2e/storage/utils" imageutils "k8s.io/kubernetes/test/utils/image" netutils "k8s.io/utils/net" ) @@ -350,20 +349,7 @@ func (config *NetworkingTestConfig) DialFromContainer(ctx context.Context, proto } if responses.Difference(expectedResponses).Len() > 0 { returnMsg := fmt.Errorf("received unexpected responses... \nAttempt %d\nCommand %v\nretrieved %v\nexpected %v", i, cmd, responses, expectedResponses) - // TODO(aojea) Remove once issues.k8s.io/123760 is solved - // Dump the nodes network routes and addresses for troubleshooting #123760 framework.Logf("encountered error during dial (%v)", returnMsg) - hostExec := storageutils.NewHostExec(config.f) - ginkgo.DeferCleanup(hostExec.Cleanup) - cmd := `echo "IP routes: " && ip route && echo "IP addresses:" && ip addr && echo "Open sockets: " && ss -anp --socket=tcp` - for _, node := range config.Nodes { - result, err := hostExec.IssueCommandWithResult(ctx, cmd, &node) - if err != nil { - framework.Logf("error occurred while executing command %s on node: %v", cmd, err) - continue - } - framework.Logf("Dump network information for node %s:\n%s", node.Name, result) - } return returnMsg }