Unverified Commit 06e73736 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

Merge pull request #69589 from oomichi/issue/69588

Add the existence check of /proc/net/nf_conntrack
parents e133ab27 f3e59a5c
...@@ -3419,8 +3419,8 @@ func IssueSSHCommandWithResult(cmd, provider string, node *v1.Node) (*SSHResult, ...@@ -3419,8 +3419,8 @@ func IssueSSHCommandWithResult(cmd, provider string, node *v1.Node) (*SSHResult,
LogSSHResult(result) LogSSHResult(result)
if result.Code != 0 || err != nil { if result.Code != 0 || err != nil {
return nil, fmt.Errorf("failed running %q: %v (exit code %d)", return nil, fmt.Errorf("failed running %q: %v (exit code %d, stderr %v)",
cmd, err, result.Code) cmd, err, result.Code, result.Stderr)
} }
return &result, nil return &result, nil
......
...@@ -77,6 +77,16 @@ var _ = SIGDescribe("Network", func() { ...@@ -77,6 +77,16 @@ var _ = SIGDescribe("Network", func() {
zero := int64(0) zero := int64(0)
// Some distributions (Ubuntu 16.04 etc.) don't support the proc file.
_, err := framework.IssueSSHCommandWithResult(
"ls /proc/net/nf_conntrack",
framework.TestContext.Provider,
clientNodeInfo.node)
if err != nil && strings.Contains(err.Error(), "No such file or directory") {
framework.Skipf("The node %s does not support /proc/net/nf_conntrack", clientNodeInfo.name)
}
framework.ExpectNoError(err)
clientPodSpec := &v1.Pod{ clientPodSpec := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "e2e-net-client", Name: "e2e-net-client",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment