From 2548fa11125c93b7129a15cb8841f83506bef5ea Mon Sep 17 00:00:00 2001
From: Antonio Ojea <aojea@redhat.com>
Date: Fri, 8 Jan 2021 10:04:40 +0100
Subject: [PATCH] Revert "dump conntrack table on e2e conntrack failures"

This reverts commit 0ef7f27fc134a3d7914ecbf555aa89933ff85357.

The info is not enough to debug the problems, there are simply no
conntrack entries but there is no clue about it.

Another problem is that it dumps the conntrack entries from all
nodes, that is more than 40 mins in a scale test job with 5000 nodes.
---
 test/e2e/network/conntrack.go | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/test/e2e/network/conntrack.go b/test/e2e/network/conntrack.go
index 55bd1a97c23..face3f563ad 100644
--- a/test/e2e/network/conntrack.go
+++ b/test/e2e/network/conntrack.go
@@ -17,7 +17,6 @@ limitations under the License.
 package network
 
 import (
-	"context"
 	"fmt"
 	"strings"
 	"time"
@@ -126,9 +125,6 @@ var _ = SIGDescribe("Conntrack", func() {
 	})
 
 	ginkgo.It("should be able to preserve UDP traffic when server pod cycles for a NodePort service", func() {
-		// TODO(#91236): Remove once the test is debugged and fixed.
-		// dump conntrack table for debugging
-		defer dumpConntrack(cs)
 
 		// Create a NodePort service
 		udpJig := e2eservice.NewTestJig(cs, ns, serviceName)
@@ -206,9 +202,6 @@ var _ = SIGDescribe("Conntrack", func() {
 	})
 
 	ginkgo.It("should be able to preserve UDP traffic when server pod cycles for a ClusterIP service", func() {
-		// TODO(#91236): Remove once the test is debugged and fixed.
-		// dump conntrack table for debugging
-		defer dumpConntrack(cs)
 
 		// Create a ClusterIP service
 		udpJig := e2eservice.NewTestJig(cs, ns, serviceName)
@@ -285,24 +278,3 @@ var _ = SIGDescribe("Conntrack", func() {
 		}
 	})
 })
-
-func dumpConntrack(cs clientset.Interface) {
-	// Dump conntrack table of each node for troubleshooting using the kube-proxy pods
-	namespace := "kube-system"
-	pods, err := cs.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{})
-	if err != nil || len(pods.Items) == 0 {
-		framework.Logf("failed to list kube-proxy pods in namespace: %s", namespace)
-		return
-	}
-	cmd := "conntrack -L"
-	for _, pod := range pods.Items {
-		if strings.Contains(pod.Name, "kube-proxy") {
-			stdout, err := framework.RunHostCmd(namespace, pod.Name, cmd)
-			if err != nil {
-				framework.Logf("Failed to dump conntrack table of node %s: %v", pod.Spec.NodeName, err)
-				continue
-			}
-			framework.Logf("conntrack table of node %s: %s", pod.Spec.NodeName, stdout)
-		}
-	}
-}