mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #3283 from GoogleCloudPlatform/revert-3273-fix_master_conflict
Revert "Fix inflight merge conflict by adapting rollingupdate to #2861"
This commit is contained in:
commit
5963c1735e
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user