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
66d37b56
Commit
66d37b56
authored
Apr 01, 2015
by
Zach Loafman
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6297 from pmorie/fix-6294
Fix issue 6294: networking e2e should set args, not command
parents
762c4490
0335e350
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
runner.go
pkg/kubelet/dockertools/runner.go
+2
-0
networking.go
test/e2e/networking.go
+1
-1
No files found.
pkg/kubelet/dockertools/runner.go
View file @
66d37b56
...
...
@@ -69,6 +69,8 @@ func (r *DockerContainerRunner) RunContainer(pod *api.Pod, container *api.Contai
setEntrypointAndCommand
(
container
,
&
dockerOpts
)
glog
.
V
(
3
)
.
Infof
(
"Container %v/%v/%v: setting entrypoint
\"
%v
\"
and command
\"
%v
\"
"
,
pod
.
Namespace
,
pod
.
Name
,
container
.
Name
,
dockerOpts
.
Config
.
Entrypoint
,
dockerOpts
.
Config
.
Cmd
)
dockerContainer
,
err
:=
r
.
Client
.
CreateContainer
(
dockerOpts
)
if
err
!=
nil
{
if
ref
!=
nil
{
...
...
test/e2e/networking.go
View file @
66d37b56
...
...
@@ -117,7 +117,7 @@ var _ = Describe("Networking", func() {
{
Name
:
"webserver"
,
Image
:
"kubernetes/nettest:1.1"
,
Command
:
[]
string
{
Args
:
[]
string
{
"-service="
+
name
,
fmt
.
Sprintf
(
"-peers=%d"
,
peers
),
"-namespace="
+
ns
},
...
...
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