Merge pull request #97839 from aojea/nodebugconntrack

Revert "dump conntrack table on e2e conntrack failures"
This commit is contained in:
Kubernetes Prow Robot 2021-01-08 02:02:53 -08:00 committed by GitHub
commit 6ba09e9a52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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)
}
}
}