Commit 6277eea5 authored by k8s-merge-robot's avatar k8s-merge-robot

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
...@@ -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...)
} }
......
...@@ -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