Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
06e73736
Unverified
Commit
06e73736
authored
Nov 09, 2018
by
k8s-ci-robot
Committed by
GitHub
Nov 09, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #69589 from oomichi/issue/69588
Add the existence check of /proc/net/nf_conntrack
parents
e133ab27
f3e59a5c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
util.go
test/e2e/framework/util.go
+2
-2
kube_proxy.go
test/e2e/network/kube_proxy.go
+10
-0
No files found.
test/e2e/framework/util.go
View file @
06e73736
...
@@ -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
...
...
test/e2e/network/kube_proxy.go
View file @
06e73736
...
@@ -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"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment