From 8cfe099af1fd8549906c65a50e2e1d108e64d90a Mon Sep 17 00:00:00 2001
From: Jeff Lowdermilk <jeffml@google.com>
Date: Tue, 24 Feb 2015 12:06:24 -0800
Subject: [PATCH] Revert "fix kubectl config view to respect serialization
 formats"

---
 pkg/kubectl/cmd/config/config_test.go | 35 +--------------------------
 pkg/kubectl/cmd/config/view.go        | 10 +-------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/pkg/kubectl/cmd/config/config_test.go b/pkg/kubectl/cmd/config/config_test.go
index 75bfe1b8832..3be8f0ab1c0 100644
--- a/pkg/kubectl/cmd/config/config_test.go
+++ b/pkg/kubectl/cmd/config/config_test.go
@@ -18,7 +18,6 @@ package config
 
 import (
 	"bytes"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"reflect"
@@ -48,36 +47,6 @@ type configCommandTest struct {
 	expectedOutputs []string
 }
 
-func ExampleView() {
-	expectedConfig := newRedFederalCowHammerConfig()
-	test := configCommandTest{
-		args:           []string{"view"},
-		startingConfig: newRedFederalCowHammerConfig(),
-		expectedConfig: expectedConfig,
-	}
-
-	output := test.run(nil)
-	fmt.Printf("%v", output)
-	// Output:
-	// apiVersion: v1
-	// clusters:
-	// - cluster:
-	//     server: http://cow.org:8080
-	//   name: cow-cluster
-	// contexts:
-	// - context:
-	//     cluster: cow-cluster
-	//     user: red-user
-	//   name: federal-context
-	// current-context: ""
-	// kind: Config
-	// preferences: {}
-	// users:
-	// - name: red-user
-	//   user:
-	//     token: red-token
-}
-
 func TestSetCurrentContext(t *testing.T) {
 	expectedConfig := newRedFederalCowHammerConfig()
 	expectedConfig.CurrentContext = "the-new-context"
@@ -571,7 +540,7 @@ func testConfigCommand(args []string, startingConfig clientcmdapi.Config) (strin
 	return buf.String(), *config
 }
 
-func (test configCommandTest) run(t *testing.T) string {
+func (test configCommandTest) run(t *testing.T) {
 	out, actualConfig := testConfigCommand(test.args, test.startingConfig)
 
 	testSetNilMapsToEmpties(reflect.ValueOf(&test.expectedConfig))
@@ -587,8 +556,6 @@ func (test configCommandTest) run(t *testing.T) string {
 			t.Errorf("expected '%s' in output, got '%s'", expectedOutput, out)
 		}
 	}
-
-	return out
 }
 func testSetNilMapsToEmpties(curr reflect.Value) {
 	actualCurrValue := curr
diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go
index 58016b741a7..434cc2c9b3d 100644
--- a/pkg/kubectl/cmd/config/view.go
+++ b/pkg/kubectl/cmd/config/view.go
@@ -26,8 +26,6 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
 	clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api/latest"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
@@ -52,20 +50,14 @@ $ kubectl config view --local`,
 		Run: func(cmd *cobra.Command, args []string) {
 			options.complete()
 
-			printer, generic, err := cmdutil.PrinterForCommand(cmd)
+			printer, _, err := cmdutil.PrinterForCommand(cmd)
 			if err != nil {
 				glog.FatalDepth(1, err)
 			}
-			if generic {
-				version := cmdutil.OutputVersion(cmd, latest.Version)
-				printer = kubectl.NewVersionedPrinter(printer, clientcmdapi.Scheme, version)
-			}
-
 			config, err := options.loadConfig()
 			if err != nil {
 				glog.FatalDepth(1, err)
 			}
-
 			err = printer.PrintObj(config, out)
 			if err != nil {
 				glog.FatalDepth(1, err)