Merge pull request #57500 from niuzhenguo/unique-resource-mappings

Automatic merge from submit-queue (batch tested with PRs 57500, 58840, 58883). 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>. Make REST mappings for resources a unique list This ensures the mappings list for resources(shortcuts, plural) unique, instead of doing multiple requests to server for the same resource. **What this PR does / why we need it**: Treat resource shortcuts, plurals the same thing on kubectl side instead of doing multiple requests to servers, and outputs should not duplicate entires. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #57498 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57500 from niuzhenguo/unique-resource-mappings
c338209e · Kubernetes Submit Queue · GitHub · 462d9f22 · 6be1b975 · c338209e
Unverified Commit c338209e authored Jan 26, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 26, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

builder.go pkg/kubectl/resource/builder.go +6 -0

No files found.
--- a/pkg/kubectl/resource/builder.go
+++ b/pkg/kubectl/resource/builder.go
@@ -622,11 +622,17 @@ func (b *Builder) resourceMappings() ([]*meta.RESTMapping, error) {
 		return nil, fmt.Errorf("you may only specify a single resource type")
 	}
 	mappings := []*meta.RESTMapping{}
+	seen := map[schema.GroupVersionKind]bool{}
 	for _, r := range b.resources {
 		mapping, err := b.mappingFor(r)
 		if err != nil {
 			return nil, err
 		}
+		// This ensures the mappings for resources(shortcuts, plural) unique
+		if seen[mapping.GroupVersionKind] {
+			continue
+		}
+		seen[mapping.GroupVersionKind] = true
 		mappings = append(mappings, mapping)
 	}