From cfffe7049c5841ff7acd81b15f360addb4403340 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 7 Jan 2015 12:42:28 -0800 Subject: [PATCH] Revert "Fix inflight merge conflict by adapting rollingupdate to #2861" --- pkg/kubectl/cmd/rollingupdate.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index b40b9c5a69a..839c09c874e 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -21,7 +21,6 @@ import ( "io" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" "github.com/spf13/cobra" ) @@ -69,9 +68,7 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f - err = CompareNamespaceFromFile(cmd, namespace) checkErr(err) - config, err := f.ClientConfig.ClientConfig() - checkErr(err) - client, err := client.New(config) + client, err := f.ClientBuilder.Client() checkErr(err) obj, err := mapping.Codec.Decode(data) checkErr(err)