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
6277eea5
Commit
6277eea5
authored
Jun 01, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #26200 from yifan-gu/remove_systemd_quotes
Automatic merge from submit-queue rkt: Remove quotes in the systemd ExecStart command. cc @euank @dcbw
parents
99fab4a8
6cb87e8d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
rkt.go
pkg/kubelet/rkt/rkt.go
+1
-1
rkt_test.go
pkg/kubelet/rkt/rkt_test.go
+2
-2
No files found.
pkg/kubelet/rkt/rkt.go
View file @
6277eea5
...
@@ -943,7 +943,7 @@ func (r *Runtime) generateRunCommand(pod *api.Pod, uuid, netnsName string) (stri
...
@@ -943,7 +943,7 @@ func (r *Runtime) generateRunCommand(pod *api.Pod, uuid, netnsName string) (stri
// TODO: switch to 'ip netns exec' once we can depend on a new
// TODO: switch to 'ip netns exec' once we can depend on a new
// enough version that doesn't have bugs like
// enough version that doesn't have bugs like
// https://bugzilla.redhat.com/show_bug.cgi?id=882047
// https://bugzilla.redhat.com/show_bug.cgi?id=882047
nsenterExec
:=
[]
string
{
r
.
nsenterPath
,
"--net=
\"
"
+
netnsPathFromName
(
netnsName
)
+
"
\"
"
,
"--"
}
nsenterExec
:=
[]
string
{
r
.
nsenterPath
,
"--net=
"
+
netnsPathFromName
(
netnsName
)
,
"--"
}
runPrepared
=
append
(
nsenterExec
,
runPrepared
...
)
runPrepared
=
append
(
nsenterExec
,
runPrepared
...
)
}
}
...
...
pkg/kubelet/rkt/rkt_test.go
View file @
6277eea5
...
@@ -1128,7 +1128,7 @@ func TestGenerateRunCommand(t *testing.T) {
...
@@ -1128,7 +1128,7 @@ func TestGenerateRunCommand(t *testing.T) {
[]
string
{},
[]
string
{},
"pod-hostname-foo"
,
"pod-hostname-foo"
,
nil
,
nil
,
" --net=
\"
/var/run/netns/default
\"
-- /bin/rkt/rkt --insecure-options=image,ondisk --local-config=/var/rkt/local/data --dir=/var/data run-prepared --net=host --hostname=pod-hostname-foo rkt-uuid-foo"
,
" --net=
/var/run/netns/default
-- /bin/rkt/rkt --insecure-options=image,ondisk --local-config=/var/rkt/local/data --dir=/var/data run-prepared --net=host --hostname=pod-hostname-foo rkt-uuid-foo"
,
},
},
// Case #2, returns no dns, with host-net.
// Case #2, returns no dns, with host-net.
{
{
...
@@ -1168,7 +1168,7 @@ func TestGenerateRunCommand(t *testing.T) {
...
@@ -1168,7 +1168,7 @@ func TestGenerateRunCommand(t *testing.T) {
[]
string
{
"."
},
[]
string
{
"."
},
"pod-hostname-foo"
,
"pod-hostname-foo"
,
nil
,
nil
,
" --net=
\"
/var/run/netns/default
\"
-- /bin/rkt/rkt --insecure-options=image,ondisk --local-config=/var/rkt/local/data --dir=/var/data run-prepared --net=host --dns=127.0.0.1 --dns-search=. --dns-opt=ndots:5 --hostname=pod-hostname-foo rkt-uuid-foo"
,
" --net=
/var/run/netns/default
-- /bin/rkt/rkt --insecure-options=image,ondisk --local-config=/var/rkt/local/data --dir=/var/data run-prepared --net=host --dns=127.0.0.1 --dns-search=. --dns-opt=ndots:5 --hostname=pod-hostname-foo rkt-uuid-foo"
,
},
},
// Case #4, returns no dns, dns searches, with host-network.
// Case #4, returns no dns, dns searches, with host-network.
{
{
...
...
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