github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3283 from GoogleCloudPlatform/revert-3273-fix_master_conflict

Browse Source 
Revert "Fix inflight merge conflict by adapting rollingupdate to #2861"
This commit is contained in:
Brendan Burns
2015-01-07 12:43:26 -08:00
parent b11e40cbea cfffe7049c
commit 5963c1735e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/cmd/rollingupdate.go
View File

@@ -21,7 +21,6 @@ import (
"io" "io"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@@ -69,9 +68,7 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
err = CompareNamespaceFromFile(cmd, namespace) err = CompareNamespaceFromFile(cmd, namespace)
checkErr(err) checkErr(err)
config, err := f.ClientConfig.ClientConfig() client, err := f.ClientBuilder.Client()
checkErr(err)
client, err := client.New(config)
checkErr(err) checkErr(err)
obj, err := mapping.Codec.Decode(data) obj, err := mapping.Codec.Decode(data)
checkErr(err) checkErr(err)