@@ -440,6 +440,10 @@ func (o CreateNodeConfigOptions) MakeNodeConfig(serverCertFile, serverKeyFile, n

 	if err != nil {

 		return err

 	}

+	config = internal.(*configapi.NodeConfig)

+

+	// For new configurations, use protobuf.

+	configapi.SetProtobufClientDefaults(config.MasterClientConnectionOverrides)

 	content, err := latestconfigapi.WriteYAML(internal)

 	if err != nil {

@@ -289,9 +289,19 @@ func GetNodeFileReferences(config *NodeConfig) []*string {

 	return refs

 }

+// SetProtobufClientDefaults sets the appropriate content types for defaulting to protobuf

+// client communications and increases the default QPS and burst. This is used to override

+// defaulted config supporting versions older than 1.3 for new configurations generated in 1.3+.

+func SetProtobufClientDefaults(overrides *ClientConnectionOverrides) {

+	overrides.AcceptContentTypes = "application/vnd.kubernetes.protobuf,application/json"

+	overrides.ContentType = "application/vnd.kubernetes.protobuf"

+	overrides.QPS *= 2

+	overrides.Burst *= 2

+}

+

 // TODO: clients should be copied and instantiated from a common client config, tweaked, then

 // given to individual controllers and other infrastructure components.

-func GetKubeClient(kubeConfigFile string) (*kclient.Client, *restclient.Config, error) {

+func GetKubeClient(kubeConfigFile string, overrides *ClientConnectionOverrides) (*kclient.Client, *restclient.Config, error) {

 	loadingRules := &clientcmd.ClientConfigLoadingRules{}

 	loadingRules.ExplicitPath = kubeConfigFile

 	loader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{})

@@ -301,10 +311,7 @@ func GetKubeClient(kubeConfigFile string) (*kclient.Client, *restclient.Config,

 		return nil, nil, err

 	}

-	// This is an internal client which is shared by most controllers, so boost default QPS

-	// TODO: this should be configured by the caller, not in this method.

-	kubeConfig.QPS = 100.0

-	kubeConfig.Burst = 200

+	applyClientConnectionOverrides(overrides, kubeConfig)

 	kubeConfig.WrapTransport = DefaultClientTransport

 	kubeClient, err := kclient.New(kubeConfig)

@@ -316,8 +323,9 @@ func GetKubeClient(kubeConfigFile string) (*kclient.Client, *restclient.Config,

 }

 // TODO: clients should be copied and instantiated from a common client config, tweaked, then

-// given to individual controllers and other infrastructure components.

-func GetOpenShiftClient(kubeConfigFile string) (*client.Client, *restclient.Config, error) {

+// given to individual controllers and other infrastructure components. Overrides are optional

+// and may alter the default configuration.

+func GetOpenShiftClient(kubeConfigFile string, overrides *ClientConnectionOverrides) (*client.Client, *restclient.Config, error) {

 	loadingRules := &clientcmd.ClientConfigLoadingRules{}

 	loadingRules.ExplicitPath = kubeConfigFile

 	loader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{})

@@ -327,10 +335,7 @@ func GetOpenShiftClient(kubeConfigFile string) (*client.Client, *restclient.Conf

 		return nil, nil, err

 	}

-	// This is an internal client which is shared by most controllers, so boost default QPS

-	// TODO: this should be configured by the caller, not in this method.

-	kubeConfig.QPS = 150.0

-	kubeConfig.Burst = 300

+	applyClientConnectionOverrides(overrides, kubeConfig)

 	kubeConfig.WrapTransport = DefaultClientTransport

 	openshiftClient, err := client.New(kubeConfig)

@@ -341,6 +346,17 @@ func GetOpenShiftClient(kubeConfigFile string) (*client.Client, *restclient.Conf

 	return openshiftClient, kubeConfig, nil

 }

+// applyClientConnectionOverrides updates a kubeConfig with the overrides from the config.

+func applyClientConnectionOverrides(overrides *ClientConnectionOverrides, kubeConfig *restclient.Config) {

+	if overrides == nil {

+		return

+	}

+	kubeConfig.QPS = overrides.QPS

+	kubeConfig.Burst = int(overrides.Burst)

+	kubeConfig.ContentConfig.AcceptContentTypes = overrides.AcceptContentTypes

+	kubeConfig.ContentConfig.ContentType = overrides.ContentType

+}

+

 // DefaultClientTransport sets defaults for a client Transport that are suitable

 // for use by infrastructure components.

 func DefaultClientTransport(rt http.RoundTripper) http.RoundTripper {

@@ -50,6 +50,35 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 				obj.RoutingConfig.Subdomain = "router.default.svc.cluster.local"

 			}

+			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides == nil {

+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides = &configapi.ClientConnectionOverrides{

+					QPS:                2.0,

+					Burst:              2,

+					AcceptContentTypes: "test/second",

+					ContentType:        "test/first",

+				}

+			}

+			if len(obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.AcceptContentTypes) == 0 {

+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.AcceptContentTypes = "test/fourth"

+			}

+			if len(obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.ContentType) == 0 {

+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides.ContentType = "test/fifth"

+			}

+			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides == nil {

+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides = &configapi.ClientConnectionOverrides{

+					QPS:                1.0,

+					Burst:              1,

+					AcceptContentTypes: "test/other",

+					ContentType:        "test/third",

+				}

+			}

+			if len(obj.MasterClients.ExternalKubernetesClientConnectionOverrides.AcceptContentTypes) == 0 {

+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.AcceptContentTypes = "test/fourth"

+			}

+			if len(obj.MasterClients.ExternalKubernetesClientConnectionOverrides.ContentType) == 0 {

+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides.ContentType = "test/fifth"

+			}

+

 			// Populate the new NetworkConfig.ServiceNetworkCIDR field from the KubernetesMasterConfig.ServicesSubnet field if needed

 			if len(obj.NetworkConfig.ServiceNetworkCIDR) == 0 {

 				if obj.KubernetesMasterConfig != nil && len(obj.KubernetesMasterConfig.ServicesSubnet) > 0 {

@@ -143,6 +172,21 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 				obj.IPTablesSyncPeriod = "5s"

 			}

+			if obj.MasterClientConnectionOverrides == nil {

+				obj.MasterClientConnectionOverrides = &configapi.ClientConnectionOverrides{

+					QPS:                1.0,

+					Burst:              1,

+					AcceptContentTypes: "test/other",

+					ContentType:        "test/third",

+				}

+			}

+			if len(obj.MasterClientConnectionOverrides.AcceptContentTypes) == 0 {

+				obj.MasterClientConnectionOverrides.AcceptContentTypes = "test/fourth"

+			}

+			if len(obj.MasterClientConnectionOverrides.ContentType) == 0 {

+				obj.MasterClientConnectionOverrides.ContentType = "test/fifth"

+			}

+

 			// Auth cache defaults

 			if len(obj.AuthConfig.AuthenticationCacheTTL) == 0 {

 				obj.AuthConfig.AuthenticationCacheTTL = "5m"

@@ -100,6 +100,9 @@ type NodeConfig struct {

 	// MasterKubeConfig is a filename for the .kubeconfig file that describes how to connect this node to the master

 	MasterKubeConfig string

+	// MasterClientConnectionOverrides provides overrides to the client connection used to connect to the master.

+	MasterClientConnectionOverrides *ClientConnectionOverrides

+

 	// DNSDomain holds the domain suffix

 	DNSDomain string

@@ -539,6 +542,25 @@ type MasterClients struct {

 	OpenShiftLoopbackKubeConfig string

 	// ExternalKubernetesKubeConfig is a .kubeconfig filename for proxying to kubernetes

 	ExternalKubernetesKubeConfig string

+

+	// OpenShiftLoopbackClientConnectionOverrides specifies client overrides for system components to loop back to this master.

+	OpenShiftLoopbackClientConnectionOverrides *ClientConnectionOverrides

+	// ExternalKubernetesClientConnectionOverrides specifies client overrides for proxying to Kubernetes.

+	ExternalKubernetesClientConnectionOverrides *ClientConnectionOverrides

+}

+

+type ClientConnectionOverrides struct {

+	// AcceptContentTypes defines the Accept header sent by clients when connecting to a server, overriding the

+	// default value of 'application/json'. This field will control all connections to the server used by a particular

+	// client.

+	AcceptContentTypes string

+	// ContentType is the content type used when sending data to the server from this client.

+	ContentType string

+

+	// QPS controls the number of queries per second allowed for this connection.

+	QPS float32

+	// Burst allows extra queries to accumulate when a client is exceeding its rate.

+	Burst int32

 }

 type DNSConfig struct {

@@ -46,6 +46,23 @@ func addDefaultingFuncs(scheme *runtime.Scheme) {

 				obj.JenkinsPipelineConfig.Enabled = &v

 			}

+			if obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides == nil {

+				obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides = &ClientConnectionOverrides{

+					// historical values

+					QPS:   150.0,

+					Burst: 300,

+				}

+			}

+			setDefault_ClientConnectionOverrides(obj.MasterClients.OpenShiftLoopbackClientConnectionOverrides)

+			if obj.MasterClients.ExternalKubernetesClientConnectionOverrides == nil {

+				obj.MasterClients.ExternalKubernetesClientConnectionOverrides = &ClientConnectionOverrides{

+					// historical values

+					QPS:   100.0,

+					Burst: 200,

+				}

+			}

+			setDefault_ClientConnectionOverrides(obj.MasterClients.ExternalKubernetesClientConnectionOverrides)

+

 			// Populate the new NetworkConfig.ServiceNetworkCIDR field from the KubernetesMasterConfig.ServicesSubnet field if needed

 			if len(obj.NetworkConfig.ServiceNetworkCIDR) == 0 {

 				if obj.KubernetesMasterConfig != nil && len(obj.KubernetesMasterConfig.ServicesSubnet) > 0 {

@@ -80,6 +97,15 @@ func addDefaultingFuncs(scheme *runtime.Scheme) {

 			}

 		},

 		func(obj *NodeConfig) {

+			if obj.MasterClientConnectionOverrides == nil {

+				obj.MasterClientConnectionOverrides = &ClientConnectionOverrides{

+					// historical values

+					QPS:   10.0,

+					Burst: 20,

+				}

+			}

+			setDefault_ClientConnectionOverrides(obj.MasterClientConnectionOverrides)

+

 			// Defaults/migrations for NetworkConfig

 			if len(obj.NetworkConfig.NetworkPluginName) == 0 {

 				obj.NetworkConfig.NetworkPluginName = obj.DeprecatedNetworkPluginName

@@ -309,6 +335,17 @@ func convert_runtime_RawExtension_To_runtime_Object(in *runtime.RawExtension, ou

 	return extension.Convert_runtime_RawExtension_To_runtime_Object(internal.Scheme, in, out, s)

 }

+// setDefault_ClientConnectionOverrides defaults a client connection to the pre-1.3 settings of

+// being JSON only. Callers must explicitly opt-in to Protobuf support in 1.3+.

+func setDefault_ClientConnectionOverrides(overrides *ClientConnectionOverrides) {

+	if len(overrides.AcceptContentTypes) == 0 {

+		overrides.AcceptContentTypes = "application/json"

+	}

+	if len(overrides.ContentType) == 0 {

+		overrides.ContentType = "application/json"

+	}

+}

+

 var _ runtime.NestedObjectDecoder = &MasterConfig{}

 // DecodeNestedObjects handles encoding RawExtensions on the MasterConfig, ensuring the

@@ -26,6 +26,9 @@ type NodeConfig struct {

 	// MasterKubeConfig is a filename for the .kubeconfig file that describes how to connect this node to the master

 	MasterKubeConfig string `json:"masterKubeConfig"`

+	// MasterClientConnectionOverrides provides overrides to the client connection used to connect to the master.

+	MasterClientConnectionOverrides *ClientConnectionOverrides `json:"masterClientConnectionOverrides"`

+

 	// DNSDomain holds the domain suffix

 	DNSDomain string `json:"dnsDomain"`

@@ -501,8 +504,28 @@ type HTTPServingInfo struct {

 type MasterClients struct {

 	// OpenShiftLoopbackKubeConfig is a .kubeconfig filename for system components to loopback to this master

 	OpenShiftLoopbackKubeConfig string `json:"openshiftLoopbackKubeConfig"`

-	// ExternalKubernetesKubeConfig is a .kubeconfig filename for proxying to kubernetes

+	// ExternalKubernetesKubeConfig is a .kubeconfig filename for proxying to Kubernetes

 	ExternalKubernetesKubeConfig string `json:"externalKubernetesKubeConfig"`

+

+	// OpenShiftLoopbackClientConnectionOverrides specifies client overrides for system components to loop back to this master.

+	OpenShiftLoopbackClientConnectionOverrides *ClientConnectionOverrides `json:"openshiftLoopbackClientConnectionOverrides"`

+	// ExternalKubernetesClientConnectionOverrides specifies client overrides for proxying to Kubernetes.

+	ExternalKubernetesClientConnectionOverrides *ClientConnectionOverrides `json:"externalKubernetesClientConnectionOverrides"`

+}

+

+// ClientConnectionOverrides are a set of overrides to the default client connection settings.

+type ClientConnectionOverrides struct {

+	// AcceptContentTypes defines the Accept header sent by clients when connecting to a server, overriding the

+	// default value of 'application/json'. This field will control all connections to the server used by a particular

+	// client.

+	AcceptContentTypes string `json:"acceptContentTypes"`

+	// ContentType is the content type used when sending data to the server from this client.

+	ContentType string `json:"contentType"`

+

+	// QPS controls the number of queries per second allowed for this connection.

+	QPS float32 `json:"qps"`

+	// Burst allows extra queries to accumulate when a client is exceeding its rate.

+	Burst int32 `json:"burst"`

 }

 // DNSConfig holds the necessary configuration options for DNS

@@ -40,6 +40,7 @@ imageConfig:

   latest: false

 iptablesSyncPeriod: ""

 kind: NodeConfig

+masterClientConnectionOverrides: null

 masterKubeConfig: ""

 networkConfig:

   mtu: 0

@@ -188,7 +189,9 @@ kubernetesMasterConfig:

   servicesSubnet: ""

   staticNodeNames: null

 masterClients:

+  externalKubernetesClientConnectionOverrides: null

   externalKubernetesKubeConfig: ""

+  openshiftLoopbackClientConnectionOverrides: null

   openshiftLoopbackKubeConfig: ""

 masterPublicURL: ""

 networkConfig:

@@ -81,16 +81,16 @@ type NodeConfig struct {

 }

 func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enableDNS bool) (*NodeConfig, error) {

-	originClient, _, err := configapi.GetOpenShiftClient(options.MasterKubeConfig)

+	originClient, _, err := configapi.GetOpenShiftClient(options.MasterKubeConfig, options.MasterClientConnectionOverrides)

 	if err != nil {

 		return nil, err

 	}

-	kubeClient, _, err := configapi.GetKubeClient(options.MasterKubeConfig)

+	kubeClient, _, err := configapi.GetKubeClient(options.MasterKubeConfig, options.MasterClientConnectionOverrides)

 	if err != nil {

 		return nil, err

 	}

 	// Make a separate client for event reporting, to avoid event QPS blocking node calls

-	eventClient, _, err := configapi.GetKubeClient(options.MasterKubeConfig)

+	eventClient, _, err := configapi.GetKubeClient(options.MasterKubeConfig, options.MasterClientConnectionOverrides)

 	if err != nil {

 		return nil, err

 	}

@@ -180,11 +180,11 @@ func BuildMasterConfig(options configapi.MasterConfig) (*MasterConfig, error) {

 		return nil, err

 	}

-	privilegedLoopbackKubeClient, _, err := configapi.GetKubeClient(options.MasterClients.OpenShiftLoopbackKubeConfig)

+	privilegedLoopbackKubeClient, _, err := configapi.GetKubeClient(options.MasterClients.OpenShiftLoopbackKubeConfig, options.MasterClients.OpenShiftLoopbackClientConnectionOverrides)

 	if err != nil {

 		return nil, err

 	}

-	privilegedLoopbackOpenShiftClient, privilegedLoopbackClientConfig, err := configapi.GetOpenShiftClient(options.MasterClients.OpenShiftLoopbackKubeConfig)

+	privilegedLoopbackOpenShiftClient, privilegedLoopbackClientConfig, err := configapi.GetOpenShiftClient(options.MasterClients.OpenShiftLoopbackKubeConfig, options.MasterClients.OpenShiftLoopbackClientConnectionOverrides)

 	if err != nil {

 		return nil, err

 	}

@@ -530,7 +530,7 @@ func newServiceAccountTokenGetter(options configapi.MasterConfig, client newetcd

 	if options.KubernetesMasterConfig == nil {

 		// When we're running against an external Kubernetes, use the external kubernetes client to validate service account tokens

 		// This prevents infinite auth loops if the privilegedLoopbackKubeClient authenticates using a service account token

-		kubeClient, _, err := configapi.GetKubeClient(options.MasterClients.ExternalKubernetesKubeConfig)

+		kubeClient, _, err := configapi.GetKubeClient(options.MasterClients.ExternalKubernetesKubeConfig, options.MasterClients.ExternalKubernetesClientConnectionOverrides)

 		if err != nil {

 			return nil, err

 		}

@@ -302,7 +302,7 @@ func (c *MasterConfig) RunDeploymentController() {

 	podInformer := c.Informers.Pods().Informer()

 	_, kclient := c.DeploymentControllerClients()

-	_, kclientConfig, err := configapi.GetKubeClient(c.Options.MasterClients.OpenShiftLoopbackKubeConfig)

+	_, kclientConfig, err := configapi.GetKubeClient(c.Options.MasterClients.OpenShiftLoopbackKubeConfig, c.Options.MasterClients.OpenShiftLoopbackClientConnectionOverrides)

 	if err != nil {

 		glog.Fatalf("Unable to initialize deployment controller: %v", err)

 	}

@@ -318,8 +318,13 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 	if err != nil {

 		return nil, err

 	}

+	config = internal.(*configapi.MasterConfig)

-	return internal.(*configapi.MasterConfig), nil

+	// When creating a new config, use Protobuf

+	configapi.SetProtobufClientDefaults(config.MasterClients.OpenShiftLoopbackClientConnectionOverrides)

+	configapi.SetProtobufClientDefaults(config.MasterClients.ExternalKubernetesClientConnectionOverrides)

+

+	return config, nil

 }

 func (args MasterArgs) BuildSerializeableOAuthConfig() (*configapi.OAuthConfig, error) {

@@ -156,6 +156,7 @@ func ValidateRuntime(config *configapi.NodeConfig, components *utilflags.Compone

 // BuildSerializeableNodeConfig takes the NodeArgs (partially complete config) and uses them along with defaulting behavior to create the fully specified

 // config object for starting the node

+// TODO: reconcile that this is not used by CreateNodeConfig in all-in-one start.

 func (args NodeArgs) BuildSerializeableNodeConfig() (*configapi.NodeConfig, error) {

 	var dnsIP string

 	if len(args.ClusterDNS) > 0 {

@@ -198,8 +199,12 @@ func (args NodeArgs) BuildSerializeableNodeConfig() (*configapi.NodeConfig, erro

 	if err != nil {

 		return nil, err

 	}

+	config = internal.(*configapi.NodeConfig)

-	return internal.(*configapi.NodeConfig), nil

+	// When creating a new config, use Protobuf

+	configapi.SetProtobufClientDefaults(config.MasterClientConnectionOverrides)

+

+	return config, nil

 }

 // GetServerCertHostnames returns the set of hostnames and IP addresses a serving certificate for node on this host might need to be valid for.

@@ -497,7 +497,7 @@ func StartAPI(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) error {

 	if kc != nil {

 		oc.Run([]origin.APIInstaller{kc}, unprotectedInstallers)

 	} else {

-		_, kubeClientConfig, err := configapi.GetKubeClient(oc.Options.MasterClients.ExternalKubernetesKubeConfig)

+		_, kubeClientConfig, err := configapi.GetKubeClient(oc.Options.MasterClients.ExternalKubernetesKubeConfig, oc.Options.MasterClients.ExternalKubernetesClientConnectionOverrides)

 		if err != nil {

 			return err

 		}

@@ -302,7 +302,7 @@ func StartNode(nodeConfig configapi.NodeConfig, components *utilflags.ComponentF

 		glog.Infof("Starting node networking %s (%s)", config.KubeletServer.HostnameOverride, version.Get().String())

 	}

-	_, kubeClientConfig, err := configapi.GetKubeClient(nodeConfig.MasterKubeConfig)

+	_, kubeClientConfig, err := configapi.GetKubeClient(nodeConfig.MasterKubeConfig, nodeConfig.MasterClientConnectionOverrides)

 	if err != nil {

 		return err

 	}

@@ -174,7 +174,7 @@ func (c *CLI) Verbose() *CLI {

 // REST provides an OpenShift REST client for the current user. If the user is not

 // set, then it provides REST client for the cluster admin user

 func (c *CLI) REST() *client.Client {

-	_, clientConfig, err := configapi.GetKubeClient(c.configPath)

+	_, clientConfig, err := configapi.GetKubeClient(c.configPath, nil)

 	osClient, err := client.New(clientConfig)

 	if err != nil {

 		FatalErr(err)

@@ -184,7 +184,7 @@ func (c *CLI) REST() *client.Client {

 // AdminREST provides an OpenShift REST client for the cluster admin user.

 func (c *CLI) AdminREST() *client.Client {

-	_, clientConfig, err := configapi.GetKubeClient(c.adminConfigPath)

+	_, clientConfig, err := configapi.GetKubeClient(c.adminConfigPath, nil)

 	osClient, err := client.New(clientConfig)

 	if err != nil {

 		FatalErr(err)

@@ -194,7 +194,7 @@ func (c *CLI) AdminREST() *client.Client {

 // KubeREST provides a Kubernetes REST client for the current namespace

 func (c *CLI) KubeREST() *kclient.Client {

-	kubeClient, _, err := configapi.GetKubeClient(c.configPath)

+	kubeClient, _, err := configapi.GetKubeClient(c.configPath, nil)

 	if err != nil {

 		FatalErr(err)

 	}

@@ -203,7 +203,7 @@ func (c *CLI) KubeREST() *kclient.Client {

 // AdminKubeREST provides a Kubernetes REST client for the cluster admin user.

 func (c *CLI) AdminKubeREST() *kclient.Client {

-	kubeClient, _, err := configapi.GetKubeClient(c.adminConfigPath)

+	kubeClient, _, err := configapi.GetKubeClient(c.adminConfigPath, nil)

 	if err != nil {

 		FatalErr(err)

 	}

@@ -174,7 +174,7 @@ func createTestingNS(baseName string, c *kclient.Client, labels map[string]strin

 		// The intra-pod test requires that the service account have

 		// permission to retrieve service endpoints.

-		osClient, _, err := configapi.GetOpenShiftClient(KubeConfigPath())

+		osClient, _, err := configapi.GetOpenShiftClient(KubeConfigPath(), nil)

 		if err != nil {

 			return ns, err

 		}

@@ -32,7 +32,7 @@ func KubeConfigPath() string {

 }

 func GetClusterAdminKubeClient(adminKubeConfigFile string) (*kclient.Client, error) {

-	c, _, err := configapi.GetKubeClient(adminKubeConfigFile)

+	c, _, err := configapi.GetKubeClient(adminKubeConfigFile, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -52,7 +52,7 @@ func GetClusterAdminClient(adminKubeConfigFile string) (*client.Client, error) {

 }

 func GetClusterAdminClientConfig(adminKubeConfigFile string) (*restclient.Config, error) {

-	_, conf, err := configapi.GetKubeClient(adminKubeConfigFile)

+	_, conf, err := configapi.GetKubeClient(adminKubeConfigFile, nil)

 	if err != nil {

 		return nil, err

 	}

@@ -94,7 +94,11 @@ func DumpEtcdOnFailure(t *testing.T) {

 	pc := make([]uintptr, 10)

 	goruntime.Callers(2, pc)

 	f := goruntime.FuncForPC(pc[0])

-	name := f.Name()[strings.LastIndex(f.Name(), "Test"):]

+	last := strings.LastIndex(f.Name(), "Test")

+	if last == -1 {

+		last = 0

+	}

+	name := f.Name()[last:]

 	client := NewEtcdClient()

 	etcdResponse, err := client.RawGet("/", false, true)