Revert "Revert "add kubeconfig types""

This reverts commit 02dbad7094.
2015-01-07 15:59:22 -05:00
parent 3ddde070f3
commit 480635bb72
34 changed files with 2606 additions and 719 deletions
--- a/pkg/kubectl/cmd/version.go
+++ b/pkg/kubectl/cmd/version.go
@@ -19,8 +19,10 @@ package cmd
 import (
 	"io"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	"github.com/spf13/cobra"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 )

 func (f *Factory) NewCmdVersion(out io.Writer) *cobra.Command {
@@ -31,7 +33,9 @@ func (f *Factory) NewCmdVersion(out io.Writer) *cobra.Command {
 			if GetFlagBool(cmd, "client") {
 				kubectl.GetClientVersion(out)
 			} else {
-				client, err := f.ClientBuilder.Client()
+				config, err := f.ClientConfig.ClientConfig()
+				checkErr(err)
+				client, err := client.New(config)
 				checkErr(err)

 				kubectl.GetVersion(out, client)