Merge pull request #63613 from deads2k/cli-52-builderclient

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. construct resource.Builder from kubeconfig flags updates the resource.Builder to be constructed from the kubeconfig flags struct/interface that we now have. @kubernetes/sig-cli-maintainers @juanvallejo @soltysh ```release-note NONE ``` Kubernetes-commit: 7e75a09db6dc13218b4f5e06493115ae96f83774
2025-07-31 23:00:26 +00:00 · 2018-05-10 09:03:11 -07:00 · 2018-05-10 09:03:11 -07:00 · cf2db96347
commit cf2db96347
parent b2243688f8 3fb1070233
3 changed files with 54 additions and 57 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@ -1,6 +1,6 @@
 {
 	"ImportPath": "k8s.io/client-go",
-	"GoVersion": "go1.10",
+	"GoVersion": "go1.9",
 	"GodepVersion": "v80",
 	"Packages": [
 		"./..."
@ -368,203 +368,203 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "53d615ae3f440f957cb9989d989d597f047262d9"
+			"Rev": "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
--- a/restmapper/category_expansion.go
+++ b/restmapper/category_expansion.go
@ -48,11 +48,11 @@ type discoveryCategoryExpander struct {
 // NewDiscoveryCategoryExpander returns a category expander that makes use of the "categories" fields from
 // the API, found through the discovery client. In case of any error or no category found (which likely
 // means we're at a cluster prior to categories support, fallback to the expander provided.
-func NewDiscoveryCategoryExpander(client discovery.DiscoveryInterface) (CategoryExpander, error) {
+func NewDiscoveryCategoryExpander(client discovery.DiscoveryInterface) CategoryExpander {
 	if client == nil {
 		panic("Please provide discovery client to shortcut expander")
 	}
-	return discoveryCategoryExpander{discoveryClient: client}, nil
+	return discoveryCategoryExpander{discoveryClient: client}
 }

 // Expand fulfills CategoryExpander
--- a/restmapper/category_expansion_test.go
+++ b/restmapper/category_expansion_test.go
@ -135,10 +135,7 @@ func TestDiscoveryCategoryExpander(t *testing.T) {
 		dc.serverResourcesHandler = func() ([]*metav1.APIResourceList, error) {
 			return test.serverResponse, nil
 		}
-		expander, err := NewDiscoveryCategoryExpander(dc)
-		if err != nil {
-			t.Fatalf("unexpected error %v", err)
-		}
+		expander := NewDiscoveryCategoryExpander(dc)
 		expanded, _ := expander.Expand(test.category)
 		if !reflect.DeepEqual(expanded, test.expected) {
 			t.Errorf("expected %v, got %v", test.expected, expanded)