Skip to content

K
k3s
Commit 6cb87e8d authored by Yifan Gu's avatar Yifan Gu Committed by Yifan Gu
Browse files
Options

rkt: Remove quotes in the systemd ExecStart command.

With quotes, the service doesn't start for systemd 219 with the error saying the path of the netns cannot be found. This PR fixes the bug by removing the quotes surround the netns path.
parent 7b4e2552
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/kubelet/rkt/rkt.go
View file @ 6cb87e8d
...@@ -936,7 +936,7 @@ func (r *Runtime) generateRunCommand(pod *api.Pod, uuid, netnsName string) (stri ...@@ -936,7 +936,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 @ 6cb87e8d
...@@ -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.
{ {
......
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