github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue 6294: networking e2e should set args, not command

Browse Source
This commit is contained in:
Paul Morie 2015-04-01 11:40:23 -04:00
parent 762c449043
commit 0335e350c7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/runner.go
View File

@ -69,6 +69,8 @@ func (r *DockerContainerRunner) RunContainer(pod *api.Pod, container *api.Contai
setEntrypointAndCommand(container, &dockerOpts) 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) dockerContainer, err := r.Client.CreateContainer(dockerOpts)
if err != nil { if err != nil {
if ref != nil { if ref != nil {

2
test/e2e/networking.go
View File

@ -117,7 +117,7 @@ var _ = Describe("Networking", func() {
{ {
Name: "webserver", Name: "webserver",
Image: "kubernetes/nettest:1.1", Image: "kubernetes/nettest:1.1",
Command: []string{ Args: []string{
"-service=" + name, "-service=" + name,
fmt.Sprintf("-peers=%d", peers), fmt.Sprintf("-peers=%d", peers),
"-namespace=" + ns}, "-namespace=" + ns},