From b38d8b18a545d8fca55dfe77c682431d78cc0a84 Mon Sep 17 00:00:00 2001
From: nikhiljindal <nikhiljindal@google.com>
Date: Wed, 1 Jul 2015 16:47:02 -0700
Subject: [PATCH] Updating kubectl to use POST instead of GET

---
 pkg/kubectl/cmd/exec.go             |  2 +-
 pkg/kubectl/cmd/exec_test.go        | 33 +++++++++--------------------
 pkg/kubectl/cmd/portforward.go      |  2 +-
 pkg/kubectl/cmd/portforward_test.go | 33 +++++++++--------------------
 4 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go
index 9709661828..535cffd45a 100644
--- a/pkg/kubectl/cmd/exec.go
+++ b/pkg/kubectl/cmd/exec.go
@@ -169,7 +169,7 @@ func RunExec(f *cmdutil.Factory, cmd *cobra.Command, cmdIn io.Reader, cmdOut, cm
 		return err
 	}
 
-	req := client.RESTClient.Get().
+	req := client.RESTClient.Post().
 		Resource("pods").
 		Name(pod.Name).
 		Namespace(namespace).
diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec_test.go
index b582ea1fc7..64ef45b71a 100644
--- a/pkg/kubectl/cmd/exec_test.go
+++ b/pkg/kubectl/cmd/exec_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 )
 
@@ -116,38 +117,24 @@ func TestPodAndContainer(t *testing.T) {
 }
 
 func TestExec(t *testing.T) {
+	version := testapi.Version()
 	tests := []struct {
 		name, version, podPath, execPath, container string
 		pod                                         *api.Pod
 		execErr                                     bool
 	}{
 		{
-			name:     "v1beta3 - pod exec",
-			version:  "v1beta3",
-			podPath:  "/api/v1beta3/namespaces/test/pods/foo",
-			execPath: "/api/v1beta3/namespaces/test/pods/foo/exec",
+			name:     "pod exec",
+			version:  version,
+			podPath:  "/api/" + version + "/namespaces/test/pods/foo",
+			execPath: "/api/" + version + "/namespaces/test/pods/foo/exec",
 			pod:      execPod(),
 		},
 		{
-			name:     "v1beta3 - pod exec error",
-			version:  "v1beta3",
-			podPath:  "/api/v1beta3/namespaces/test/pods/foo",
-			execPath: "/api/v1beta3/namespaces/test/pods/foo/exec",
-			pod:      execPod(),
-			execErr:  true,
-		},
-		{
-			name:     "v1 - pod exec",
-			version:  "v1",
-			podPath:  "/api/v1/namespaces/test/pods/foo",
-			execPath: "/api/v1/namespaces/test/pods/foo/exec",
-			pod:      execPod(),
-		},
-		{
-			name:     "v1 - pod exec error",
-			version:  "v1",
-			podPath:  "/api/v1/namespaces/test/pods/foo",
-			execPath: "/api/v1/namespaces/test/pods/foo/exec",
+			name:     "pod exec error",
+			version:  version,
+			podPath:  "/api/" + version + "/namespaces/test/pods/foo",
+			execPath: "/api/" + version + "/namespaces/test/pods/foo/exec",
 			pod:      execPod(),
 			execErr:  true,
 		},
diff --git a/pkg/kubectl/cmd/portforward.go b/pkg/kubectl/cmd/portforward.go
index 0547049831..835d1a427c 100644
--- a/pkg/kubectl/cmd/portforward.go
+++ b/pkg/kubectl/cmd/portforward.go
@@ -117,7 +117,7 @@ func RunPortForward(f *cmdutil.Factory, cmd *cobra.Command, args []string, fw po
 		close(stopCh)
 	}()
 
-	req := client.RESTClient.Get().
+	req := client.RESTClient.Post().
 		Resource("pods").
 		Namespace(namespace).
 		Name(pod.Name).
diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward_test.go
index 1833468ca8..69fad51f1d 100644
--- a/pkg/kubectl/cmd/portforward_test.go
+++ b/pkg/kubectl/cmd/portforward_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 )
 
@@ -38,6 +39,7 @@ func (f *fakePortForwarder) ForwardPorts(req *client.Request, config *client.Con
 }
 
 func TestPortForward(t *testing.T) {
+	version := testapi.Version()
 
 	tests := []struct {
 		name, version, podPath, pfPath, container string
@@ -45,32 +47,17 @@ func TestPortForward(t *testing.T) {
 		pfErr                                     bool
 	}{
 		{
-			name:    "v1beta3 - pod portforward",
-			version: "v1beta3",
-			podPath: "/api/v1beta3/namespaces/test/pods/foo",
-			pfPath:  "/api/v1beta3/namespaces/test/pods/foo/portforward",
+			name:    "pod portforward",
+			version: version,
+			podPath: "/api/" + version + "/namespaces/test/pods/foo",
+			pfPath:  "/api/" + version + "/namespaces/test/pods/foo/portforward",
 			pod:     execPod(),
 		},
 		{
-			name:    "v1beta3 - pod portforward error",
-			version: "v1beta3",
-			podPath: "/api/v1beta3/namespaces/test/pods/foo",
-			pfPath:  "/api/v1beta3/namespaces/test/pods/foo/portforward",
-			pod:     execPod(),
-			pfErr:   true,
-		},
-		{
-			name:    "v1 - pod portforward",
-			version: "v1",
-			podPath: "/api/v1/namespaces/test/pods/foo",
-			pfPath:  "/api/v1/namespaces/test/pods/foo/portforward",
-			pod:     execPod(),
-		},
-		{
-			name:    "v1 - pod portforward error",
-			version: "v1",
-			podPath: "/api/v1/namespaces/test/pods/foo",
-			pfPath:  "/api/v1/namespaces/test/pods/foo/portforward",
+			name:    "pod portforward error",
+			version: version,
+			podPath: "/api/" + version + "/namespaces/test/pods/foo",
+			pfPath:  "/api/" + version + "/namespaces/test/pods/foo/portforward",
 			pod:     execPod(),
 			pfErr:   true,
 		},