From 87970bc3566506586ee30f19e039eea9906dd983 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 13 Jan 2015 18:50:36 -0500 Subject: [PATCH] Use the new client.SetKubernetesDefaults methods to properly default config object --- pkg/kubectl/cmd/cmd.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index ffaa99d2347..533b5a510db 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -325,17 +325,9 @@ func (c *clientCache) ClientConfigForVersion(version string) (*client.Config, er } } - // TODO: remove when SetKubernetesDefaults gets added - if len(version) == 0 { - version = c.defaultConfig.Version - } - // TODO: have a better config copy method config := *c.defaultConfig - - // TODO: call new client.SetKubernetesDefaults method - // instead of doing this - config.Version = version + client.SetKubernetesDefaults(&config) return &config, nil }