mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Fix inflight merge conflict by adapting rollingupdate to #2861
ClientConfig changed right as rollingupdate was introduced.
This commit is contained in:
parent
585d2c8cbd
commit
e0f0b9c588
@ -21,6 +21,7 @@ import (
|
||||
"io"
|
||||
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -68,7 +69,9 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
|
||||
err = CompareNamespaceFromFile(cmd, namespace)
|
||||
checkErr(err)
|
||||
|
||||
client, err := f.ClientBuilder.Client()
|
||||
config, err := f.ClientConfig.ClientConfig()
|
||||
checkErr(err)
|
||||
client, err := client.New(config)
|
||||
checkErr(err)
|
||||
obj, err := mapping.Codec.Decode(data)
|
||||
checkErr(err)
|
||||
|
Loading…
Reference in New Issue
Block a user