github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixing the error in registering /v1 api

Browse Source
This commit is contained in:
nikhiljindal 2016-08-15 16:03:08 -07:00
parent 096dd4df50
commit 217d2f57e9
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
federation/apis/core/install/install.go
View File

@ -91,7 +91,9 @@ var userResources = []string{"svc"}
func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper { func newRESTMapper(externalVersions []unversioned.GroupVersion) meta.RESTMapper {
// the list of kinds that are scoped at the root of the api hierarchy // the list of kinds that are scoped at the root of the api hierarchy
// if a kind is not enumerated here, it is assumed to have a namespace scope // if a kind is not enumerated here, it is assumed to have a namespace scope
rootScoped := sets.NewString() rootScoped := sets.NewString(
"Namespace",
)
// these kinds should be excluded from the list of resources // these kinds should be excluded from the list of resources
ignoredKinds := sets.NewString( ignoredKinds := sets.NewString(

8
federation/cmd/federation-apiserver/app/core.go
View File

@ -18,6 +18,14 @@ package app
import ( import (
"github.com/golang/glog" "github.com/golang/glog"
// HACK to ensure that rest mapper from pkg/api is registered for groupName="".
// This is required because both pkg/api/install and federation/apis/core/install
// are installing their respective groupMeta at the same groupName.
// federation/apis/core/install has only a subset of resources and hence if it gets registered first, then installation of v1 API fails in pkg/master.
// TODO(nikhiljindal): Fix this by ensuring that pkg/api/install and federation/apis/core/install do not conflict with each other.
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/federation/apis/core" "k8s.io/kubernetes/federation/apis/core"
_ "k8s.io/kubernetes/federation/apis/core/install" _ "k8s.io/kubernetes/federation/apis/core/install"
"k8s.io/kubernetes/federation/apis/core/v1" "k8s.io/kubernetes/federation/apis/core/v1"

4
federation/cmd/federation-apiserver/app/server_test.go
View File

@ -296,10 +296,10 @@ func testCoreResourceList(t *testing.T) {
// Verify namespaces. // Verify namespaces.
found = findResource(apiResourceList.APIResources, "namespaces") found = findResource(apiResourceList.APIResources, "namespaces")
assert.NotNil(t, found) assert.NotNil(t, found)
assert.True(t, found.Namespaced) assert.False(t, found.Namespaced)
found = findResource(apiResourceList.APIResources, "namespaces/status") found = findResource(apiResourceList.APIResources, "namespaces/status")
assert.NotNil(t, found) assert.NotNil(t, found)
assert.True(t, found.Namespaced) assert.False(t, found.Namespaced)
// Verify events. // Verify events.
found = findResource(apiResourceList.APIResources, "events") found = findResource(apiResourceList.APIResources, "events")