Improve logging of iptables canary test

Since it's [Disruptive] it only runs in periodic jobs so it's better
to have too much debugging info than too little.
This commit is contained in:
Dan Winship 2020-10-07 14:17:36 -04:00
parent 128b697d55
commit 3f4c2d6fe0

View File

@ -477,10 +477,10 @@ var _ = SIGDescribe("Networking", func() {
// restart iptables"?). So instead we just manually delete all "KUBE-" // restart iptables"?). So instead we just manually delete all "KUBE-"
// chains. // chains.
ginkgo.By("dumping iptables rules on a node") ginkgo.By("dumping iptables rules on node " + host)
result, err := e2essh.SSH("sudo iptables-save", host, framework.TestContext.Provider) result, err := e2essh.SSH("sudo iptables-save", host, framework.TestContext.Provider)
if err != nil || result.Code != 0 {
e2essh.LogResult(result) e2essh.LogResult(result)
if err != nil || result.Code != 0 {
framework.Failf("couldn't dump iptable rules: %v", err) framework.Failf("couldn't dump iptable rules: %v", err)
} }
@ -532,6 +532,9 @@ var _ = SIGDescribe("Networking", func() {
} }
return false, nil return false, nil
}) })
if err != nil {
e2essh.LogResult(result)
}
framework.ExpectNoError(err, "kubelet did not recreate its iptables rules") framework.ExpectNoError(err, "kubelet did not recreate its iptables rules")
}) })
}) })