Skip to content

K
k3s
Commit 41e7b251 authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Merge pull request #3273 from smarterclayton/fix_master_conflict

Fix inflight merge conflict by adapting rollingupdate to #2861
parents 585d2c8c e0f0b9c5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
pkg/kubectl/cmd/rollingupdate.go
View file @ 41e7b251
...@@ -21,6 +21,7 @@ import ( ...@@ -21,6 +21,7 @@ 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"
) )
...@@ -68,7 +69,9 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f - ...@@ -68,7 +69,9 @@ $ cat frontend-v2.json | kubectl rollingupdate frontend-v1 -f -
err = CompareNamespaceFromFile(cmd, namespace) err = CompareNamespaceFromFile(cmd, namespace)
checkErr(err) checkErr(err)
client, err := f.ClientBuilder.Client() config, err := f.ClientConfig.ClientConfig()
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment