From 0335e350c77ed3615cae0083d9fa5c5b028603d6 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Wed, 1 Apr 2015 11:40:23 -0400 Subject: [PATCH] Fix issue 6294: networking e2e should set args, not command --- pkg/kubelet/dockertools/runner.go | 2 ++ test/e2e/networking.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/runner.go b/pkg/kubelet/dockertools/runner.go index e6d6d9dc1c0df..4e833a557e85e 100644 --- a/pkg/kubelet/dockertools/runner.go +++ b/pkg/kubelet/dockertools/runner.go @@ -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 { diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 7a2afd3461630..e866302c960f0 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -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},