Merge pull request #42275 from deads2k/cli-05-restmapper

Automatic merge from submit-queue (batch tested with PRs 41306, 42187, 41666, 42275, 42266) discovery restmapping should always prefer /v1 The core kube API, empty group, version==v1 should always be the most preferred group and resource from a rest mapper. This special cases that. All the others should be based on discovery order as we previously agreed. @kubernetes/sig-cli-pr-reviews @kubernetes/sig-api-machinery-pr-reviews @enj

Merge pull request #42275 from deads2k/cli-05-restmapper
6db099fc · Kubernetes Submit Queue · GitHub · 097755fb · 49f8a37c · 6db099fc
Commit 6db099fc authored Mar 03, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 14 deletions

restmapper.go staging/src/k8s.io/client-go/discovery/restmapper.go +3 -2

restmapper_test.go staging/src/k8s.io/client-go/discovery/restmapper_test.go +31 -12

No files found.
--- a/staging/src/k8s.io/client-go/discovery/restmapper.go
+++ b/staging/src/k8s.io/client-go/discovery/restmapper.go
@@ -43,8 +43,9 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 	unionMapper := meta.MultiRESTMapper{}

 	var groupPriority []string
-	var resourcePriority []schema.GroupVersionResource
-	var kindPriority []schema.GroupVersionKind
+	// /v1 is special.  It should always come first
+	resourcePriority := []schema.GroupVersionResource{{Group: "", Version: "v1", Resource: meta.AnyResource}}
+	kindPriority := []schema.GroupVersionKind{{Group: "", Version: "v1", Kind: meta.AnyKind}}

 	for _, group := range groupResources {
 		groupPriority = append(groupPriority, group.Group.Name)

--- a/staging/src/k8s.io/client-go/discovery/restmapper_test.go
+++ b/staging/src/k8s.io/client-go/discovery/restmapper_test.go
@@ -37,32 +37,33 @@ func TestRESTMapper(t *testing.T) {
 	resources := []*APIGroupResources{
 		{
 			Group: metav1.APIGroup{
+				Name: "extensions",
 				Versions: []metav1.GroupVersionForDiscovery{
-					{Version: "v1"},
-					{Version: "v2"},
+					{Version: "v1beta"},
 				},
-				PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"},
+				PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1beta"},
 			},
 			VersionedResources: map[string][]metav1.APIResource{
-				"v1": {
-					{Name: "pods", Namespaced: true, Kind: "Pod"},
-				},
-				"v2": {
+				"v1beta": {
+					{Name: "jobs", Namespaced: true, Kind: "Job"},
 					{Name: "pods", Namespaced: true, Kind: "Pod"},
 				},
 			},
 		},
 		{
 			Group: metav1.APIGroup{
-				Name: "extensions",
 				Versions: []metav1.GroupVersionForDiscovery{
-					{Version: "v1beta"},
+					{Version: "v1"},
+					{Version: "v2"},
 				},
-				PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1beta"},
+				PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"},
 			},
 			VersionedResources: map[string][]metav1.APIResource{
-				"v1beta": {
-					{Name: "jobs", Namespaced: true, Kind: "Job"},
+				"v1": {
+					{Name: "pods", Namespaced: true, Kind: "Pod"},
+				},
+				"v2": {
+					{Name: "pods", Namespaced: true, Kind: "Pod"},
 				},
 			},
 		},
@@ -76,6 +77,15 @@ func TestRESTMapper(t *testing.T) {
 	}{
 		{
 			input: schema.GroupVersionResource{
+				Resource: "pods",
+			},
+			want: schema.GroupVersionKind{
+				Version: "v1",
+				Kind:    "Pod",
+			},
+		},
+		{
+			input: schema.GroupVersionResource{
 				Version:  "v1",
 				Resource: "pods",
 			},
@@ -133,6 +143,15 @@ func TestRESTMapper(t *testing.T) {
 	}{
 		{
 			input: schema.GroupVersionResource{
+				Resource: "pods",
+			},
+			want: schema.GroupVersionResource{
+				Version:  "v1",
+				Resource: "pods",
+			},
+		},
+		{
+			input: schema.GroupVersionResource{
 				Version:  "v1",
 				Resource: "pods",
 			},