From 4c8d0a3cd4aced5df339c16ec2b8abce8cd37319 Mon Sep 17 00:00:00 2001 From: He Xiaoxi Date: Tue, 19 Feb 2019 15:58:43 +0800 Subject: [PATCH] Fix duplicate container query param on exec pod command Signed-off-by: He Xiaoxi --- pkg/kubectl/cmd/exec/exec.go | 3 +-- pkg/kubectl/cmd/exec/exec_test.go | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/kubectl/cmd/exec/exec.go b/pkg/kubectl/cmd/exec/exec.go index 9f27a8a79d7..e7f40e3f71a 100644 --- a/pkg/kubectl/cmd/exec/exec.go +++ b/pkg/kubectl/cmd/exec/exec.go @@ -311,8 +311,7 @@ func (p *ExecOptions) Run() error { Resource("pods"). Name(pod.Name). Namespace(pod.Namespace). - SubResource("exec"). - Param("container", containerName) + SubResource("exec") req.VersionedParams(&corev1.PodExecOptions{ Container: containerName, Command: p.Command, diff --git a/pkg/kubectl/cmd/exec/exec_test.go b/pkg/kubectl/cmd/exec/exec_test.go index 316074e4e50..4c603bcd364 100644 --- a/pkg/kubectl/cmd/exec/exec_test.go +++ b/pkg/kubectl/cmd/exec/exec_test.go @@ -244,6 +244,10 @@ func TestExec(t *testing.T) { t.Errorf("%s: Did not get expected path for exec request", test.name) return } + if strings.Count(ex.url.RawQuery, "container=bar") != 1 { + t.Errorf("%s: Did not get expected container query param for exec request", test.name) + return + } if ex.method != "POST" { t.Errorf("%s: Did not get method for exec request: %s", test.name, ex.method) }