Merge pull request #24006 from caesarxuchao/thirdparty-preferredversion

Automatic merge from submit-queue Use the first version as thirdparty resource preferredVersion First commit is a one-liner, which implements the server-half of #23985. The other two commits rearrange the test code, and add back a commented out test of thirdparty resource. @lavalamp @nikhiljindal

Merge pull request #24006 from caesarxuchao/thirdparty-preferredversion
e81663c8 · k8s-merge-robot · 1b74e7bf · f315ffd8 · e81663c8 · e81663c8
Commit e81663c8 authored Apr 17, 2016 by k8s-merge-robot
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

master.go pkg/master/master.go +3 -2

master_test.go pkg/master/master_test.go +0 -0

No files found.
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -643,8 +643,9 @@ func (m *Master) InstallThirdPartyResource(rsrc *extensions.ThirdPartyResource) 
 		Version:      rsrc.Versions[0].Name,
 	}
 	apiGroup := unversioned.APIGroup{
-		Name:     group,
-		Versions: []unversioned.GroupVersionForDiscovery{groupVersion},
+		Name:             group,
+		Versions:         []unversioned.GroupVersionForDiscovery{groupVersion},
+		PreferredVersion: groupVersion,
 	}
 	apiserver.AddGroupWebService(api.Codecs, m.HandlerContainer, path, apiGroup)
 	m.addThirdPartyResourceStorage(path, thirdparty.Storage[strings.ToLower(kind)+"s"].(*thirdpartyresourcedataetcd.REST), apiGroup)

--- a/pkg/master/master_test.go
+++ b/pkg/master/master_test.go