Skip to content

K
k3s
Commit e81663c8 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

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
parents 1b74e7bf f315ffd8
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 59 deletions
pkg/master/master.go
View file @ e81663c8
...@@ -645,6 +645,7 @@ func (m *Master) InstallThirdPartyResource(rsrc *extensions.ThirdPartyResource) ...@@ -645,6 +645,7 @@ func (m *Master) InstallThirdPartyResource(rsrc *extensions.ThirdPartyResource)
apiGroup := unversioned.APIGroup{ apiGroup := unversioned.APIGroup{
Name: group, Name: group,
Versions: []unversioned.GroupVersionForDiscovery{groupVersion}, Versions: []unversioned.GroupVersionForDiscovery{groupVersion},
PreferredVersion: groupVersion,
} }
apiserver.AddGroupWebService(api.Codecs, m.HandlerContainer, path, apiGroup) apiserver.AddGroupWebService(api.Codecs, m.HandlerContainer, path, apiGroup)
m.addThirdPartyResourceStorage(path, thirdparty.Storage[strings.ToLower(kind)+"s"].(*thirdpartyresourcedataetcd.REST), apiGroup) m.addThirdPartyResourceStorage(path, thirdparty.Storage[strings.ToLower(kind)+"s"].(*thirdpartyresourcedataetcd.REST), apiGroup)
......
pkg/master/master_test.go
View file @ e81663c8
...@@ -36,9 +36,14 @@ import ( ...@@ -36,9 +36,14 @@ import (
utilnet "k8s.io/kubernetes/pkg/util/net" utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
apiutil "k8s.io/kubernetes/pkg/api/util"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling"
autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
"k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch"
batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/registry/endpoint" "k8s.io/kubernetes/pkg/registry/endpoint"
...@@ -83,20 +88,11 @@ func setUp(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert. ...@@ -83,20 +88,11 @@ func setUp(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.
storageVersions[extensions.GroupName] = testapi.Extensions.GroupVersion().String() storageVersions[extensions.GroupName] = testapi.Extensions.GroupVersion().String()
config.StorageVersions = storageVersions config.StorageVersions = storageVersions
config.PublicAddress = net.ParseIP("192.168.10.4") config.PublicAddress = net.ParseIP("192.168.10.4")
master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{})
return master, server, config, assert.New(t)
}
func newMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.Assertions) {
_, etcdserver, config, assert := setUp(t)
config.Serializer = api.Codecs config.Serializer = api.Codecs
config.KubeletClient = client.FakeKubeletClient{} config.KubeletClient = client.FakeKubeletClient{}
config.APIPrefix = "/api" config.APIPrefix = "/api"
config.APIGroupPrefix = "/apis" config.APIGroupPrefix = "/apis"
config.APIResourceConfigSource = DefaultAPIResourceConfigSource() config.APIResourceConfigSource = DefaultAPIResourceConfigSource()
config.ProxyDialer = func(network, addr string) (net.Conn, error) { return nil, nil } config.ProxyDialer = func(network, addr string) (net.Conn, error) { return nil, nil }
config.ProxyTLSClientConfig = &tls.Config{} config.ProxyTLSClientConfig = &tls.Config{}
...@@ -108,6 +104,33 @@ func newMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *ass ...@@ -108,6 +104,33 @@ func newMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *ass
// run the sync routine and register types manually. // run the sync routine and register types manually.
config.disableThirdPartyControllerForTesting = true config.disableThirdPartyControllerForTesting = true
master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{})
return master, server, config, assert.New(t)
}
func newMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.Assertions) {
_, etcdserver, config, assert := setUp(t)
master, err := New(&config)
if err != nil {
t.Fatalf("Error in bringing up the master: %v", err)
}
return master, etcdserver, config, assert
}
// limitedAPIResourceConfigSource only enables the core group, the extensions group, the batch group, and the autoscaling group.
func limitedAPIResourceConfigSource() *genericapiserver.ResourceConfig {
ret := genericapiserver.NewResourceConfig()
ret.EnableVersions(apiv1.SchemeGroupVersion, extensionsapiv1beta1.SchemeGroupVersion, batchapiv1.SchemeGroupVersion, autoscalingapiv1.SchemeGroupVersion)
return ret
}
// newLimitedMaster only enables the core group, the extensions group, the batch group, and the autoscaling group.
func newLimitedMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.Assertions) {
_, etcdserver, config, assert := setUp(t)
config.APIResourceConfigSource = limitedAPIResourceConfigSource()
master, err := New(&config) master, err := New(&config)
if err != nil { if err != nil {
t.Fatalf("Error in bringing up the master: %v", err) t.Fatalf("Error in bringing up the master: %v", err)
...@@ -370,10 +393,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { ...@@ -370,10 +393,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) {
} }
func TestDiscoveryAtAPIS(t *testing.T) { func TestDiscoveryAtAPIS(t *testing.T) {
// TODO(caesarxuchao): make this pass now that batch is added, master, etcdserver, config, assert := newLimitedMaster(t)
// and rewrite it so that the indexes do not need to change each time a new api group is added.
/*
master, etcdserver, config, assert := newMaster(t)
defer etcdserver.Terminate(t) defer etcdserver.Terminate(t)
server := httptest.NewServer(master.HandlerContainer.ServeMux) server := httptest.NewServer(master.HandlerContainer.ServeMux)
...@@ -390,52 +410,50 @@ func TestDiscoveryAtAPIS(t *testing.T) { ...@@ -390,52 +410,50 @@ func TestDiscoveryAtAPIS(t *testing.T) {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
expectGroupNames := []string{autoscaling.GroupName, batch.GroupName, extensions.GroupName} expectGroupNames := sets.NewString(autoscaling.GroupName, batch.GroupName, extensions.GroupName)
expectVersions := [][]unversioned.GroupVersionForDiscovery{ expectVersions := map[string][]unversioned.GroupVersionForDiscovery{
{ autoscaling.GroupName: {
{ {
GroupVersion: testapi.Autoscaling.GroupVersion().String(), GroupVersion: testapi.Autoscaling.GroupVersion().String(),
Version: testapi.Autoscaling.GroupVersion().Version, Version: testapi.Autoscaling.GroupVersion().Version,
}, },
}, },
{ batch.GroupName: {
{ {
GroupVersion: testapi.Batch.GroupVersion().String(), GroupVersion: testapi.Batch.GroupVersion().String(),
Version: testapi.Batch.GroupVersion().Version, Version: testapi.Batch.GroupVersion().Version,
}, },
}, },
{ extensions.GroupName: {
{ {
GroupVersion: testapi.Extensions.GroupVersion().String(), GroupVersion: testapi.Extensions.GroupVersion().String(),
Version: testapi.Extensions.GroupVersion().Version, Version: testapi.Extensions.GroupVersion().Version,
}, },
}, },
} }
expectPreferredVersion := []unversioned.GroupVersionForDiscovery{ expectPreferredVersion := map[string]unversioned.GroupVersionForDiscovery{
{ autoscaling.GroupName: {
GroupVersion: config.StorageVersions[autoscaling.GroupName], GroupVersion: config.StorageVersions[autoscaling.GroupName],
Version: apiutil.GetVersion(config.StorageVersions[autoscaling.GroupName]), Version: apiutil.GetVersion(config.StorageVersions[autoscaling.GroupName]),
}, },
{ batch.GroupName: {
GroupVersion: config.StorageVersions[batch.GroupName], GroupVersion: config.StorageVersions[batch.GroupName],
Version: apiutil.GetVersion(config.StorageVersions[batch.GroupName]), Version: apiutil.GetVersion(config.StorageVersions[batch.GroupName]),
}, },
{ extensions.GroupName: {
GroupVersion: config.StorageVersions[extensions.GroupName], GroupVersion: config.StorageVersions[extensions.GroupName],
Version: apiutil.GetVersion(config.StorageVersions[extensions.GroupName]), Version: apiutil.GetVersion(config.StorageVersions[extensions.GroupName]),
}, },
} }
assert.Equal(3, len(groupList.Groups))
assert.Equal(2, len(groupList.Groups)) for _, group := range groupList.Groups {
assert.Equal(expectGroupNames[0], groupList.Groups[0].Name) if !expectGroupNames.Has(group.Name) {
assert.Equal(expectGroupNames[1], groupList.Groups[1].Name) t.Errorf("got unexpected group %s", group.Name)
}
assert.Equal(expectVersions[0], groupList.Groups[0].Versions) assert.Equal(expectVersions[group.Name], group.Versions)
assert.Equal(expectVersions[1], groupList.Groups[1].Versions) assert.Equal(expectPreferredVersion[group.Name], group.PreferredVersion)
}
assert.Equal(expectPreferredVersion[0], groupList.Groups[0].PreferredVersion)
assert.Equal(expectPreferredVersion[1], groupList.Groups[1].PreferredVersion)
thirdPartyGV := unversioned.GroupVersionForDiscovery{GroupVersion: "company.com/v1", Version: "v1"} thirdPartyGV := unversioned.GroupVersionForDiscovery{GroupVersion: "company.com/v1", Version: "v1"}
master.addThirdPartyResourceStorage("/apis/company.com/v1", nil, master.addThirdPartyResourceStorage("/apis/company.com/v1", nil,
...@@ -449,35 +467,24 @@ func TestDiscoveryAtAPIS(t *testing.T) { ...@@ -449,35 +467,24 @@ func TestDiscoveryAtAPIS(t *testing.T) {
if !assert.NoError(err) { if !assert.NoError(err) {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
assert.Equal(http.StatusOK, resp.StatusCode) assert.Equal(http.StatusOK, resp.StatusCode)
assert.NoError(decodeResponse(resp, &groupList)) assert.NoError(decodeResponse(resp, &groupList))
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
thirdPartyGroupName := "company.com"
thirdPartyExpectVersions := []unversioned.GroupVersionForDiscovery{thirdPartyGV}
assert.Equal(4, len(groupList.Groups)) assert.Equal(4, len(groupList.Groups))
// autoscaling group
assert.Equal(expectGroupNames[0], groupList.Groups[0].Name) expectGroupNames.Insert("company.com")
assert.Equal(expectVersions[0], groupList.Groups[0].Versions) expectVersions["company.com"] = []unversioned.GroupVersionForDiscovery{thirdPartyGV}
assert.Equal(expectPreferredVersion[0], groupList.Groups[0].PreferredVersion) expectPreferredVersion["company.com"] = thirdPartyGV
// batch group for _, group := range groupList.Groups {
assert.Equal(expectGroupNames[1], groupList.Groups[1].Name) if !expectGroupNames.Has(group.Name) {
assert.Equal(expectVersions[1], groupList.Groups[1].Versions) t.Errorf("got unexpected group %s", group.Name)
assert.Equal(expectPreferredVersion[1], groupList.Groups[1].PreferredVersion) }
// third party assert.Equal(expectVersions[group.Name], group.Versions)
assert.Equal(thirdPartyGroupName, groupList.Groups[2].Name) assert.Equal(expectPreferredVersion[group.Name], group.PreferredVersion)
assert.Equal(thirdPartyExpectVersions, groupList.Groups[2].Versions) }
assert.Equal(thirdPartyGV, groupList.Groups[2].PreferredVersion)
// extensions group
assert.Equal(expectGroupNames[2], groupList.Groups[3].Name)
assert.Equal(expectVersions[2], groupList.Groups[3].Versions)
assert.Equal(expectPreferredVersion[2], groupList.Groups[3].PreferredVersion)
*/
} }
var versionsToTest = []string{"v1", "v3"} var versionsToTest = []string{"v1", "v3"}
...@@ -1004,13 +1011,13 @@ func testThirdPartyDiscovery(t *testing.T, version string) { ...@@ -1004,13 +1011,13 @@ func testThirdPartyDiscovery(t *testing.T, version string) {
assert.Equal(group.APIVersion, "v1") assert.Equal(group.APIVersion, "v1")
assert.Equal(group.Kind, "APIGroup") assert.Equal(group.Kind, "APIGroup")
assert.Equal(group.Name, "company.com") assert.Equal(group.Name, "company.com")
assert.Equal(group.Versions, []unversioned.GroupVersionForDiscovery{ expectedVersion := unversioned.GroupVersionForDiscovery{
{
GroupVersion: "company.com/" + version, GroupVersion: "company.com/" + version,
Version: version, Version: version,
}, }
})
assert.Equal(group.PreferredVersion, unversioned.GroupVersionForDiscovery{}) assert.Equal(group.Versions, []unversioned.GroupVersionForDiscovery{expectedVersion})
assert.Equal(group.PreferredVersion, expectedVersion)
resp, err = http.Get(server.URL + "/apis/company.com/" + version) resp, err = http.Get(server.URL + "/apis/company.com/" + version)
if !assert.NoError(err) { if !assert.NoError(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