Merge pull request kubernetes#6297 from pmorie/fix-6294

Fix issue 6294: networking e2e should set args, not command
duda · Apr 1, 2015 · 66d37b5 · 66d37b5
2 parents 762c449 + 0335e35
commit 66d37b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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},