github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Adding namespaces to federation-apiserver

Browse Source
This commit is contained in:
nikhiljindal 2016-05-25 13:06:58 -07:00
parent 524c5b5361
commit a0f96fc973
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/apis/core/register.go
View File

@ -59,6 +59,8 @@ func AddToScheme(scheme *runtime.Scheme) {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&api.ServiceList{}, &api.ServiceList{},
&api.Service{}, &api.Service{},
&api.Namespace{},
&api.NamespaceList{},
&api.ListOptions{}, &api.ListOptions{},
&api.DeleteOptions{}, &api.DeleteOptions{},
) )

1
federation/apis/core/v1/defaults.go
View File

@ -24,5 +24,6 @@ import (
func addDefaultingFuncs(scheme *runtime.Scheme) { func addDefaultingFuncs(scheme *runtime.Scheme) {
scheme.AddDefaultingFuncs( scheme.AddDefaultingFuncs(
v1.SetDefaults_ServiceSpec, v1.SetDefaults_ServiceSpec,
v1.SetDefaults_NamespaceStatus,
) )
} }

2
federation/apis/core/v1/register.go
View File

@ -38,6 +38,8 @@ func AddToScheme(scheme *runtime.Scheme) {
func addKnownTypes(scheme *runtime.Scheme) { func addKnownTypes(scheme *runtime.Scheme) {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&v1.Service{}, &v1.Service{},
&v1.Namespace{},
&v1.NamespaceList{},
&v1.ServiceList{}, &v1.ServiceList{},
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},

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

@ -27,14 +27,18 @@ import (
"k8s.io/kubernetes/federation/apis/core/v1" "k8s.io/kubernetes/federation/apis/core/v1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/rest"
namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd"
serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd" serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd"
) )
func installCoreAPIs(s *genericoptions.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) { func installCoreAPIs(s *genericoptions.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) {
serviceStore, serviceStatusStorage := serviceetcd.NewREST(createRESTOptionsOrDie(s, g, f, api.Resource("service"))) serviceStore, serviceStatusStore := serviceetcd.NewREST(createRESTOptionsOrDie(s, g, f, api.Resource("service")))
namespaceStore, namespaceStatusStore, _ := namespaceetcd.NewREST(createRESTOptionsOrDie(s, g, f, api.Resource("namespaces")))
coreResources := map[string]rest.Storage{ coreResources := map[string]rest.Storage{
"services": serviceStore, "services": serviceStore,
"services/status": serviceStatusStorage, "services/status": serviceStatusStore,
"namespaces": namespaceStore,
"namespaces/status": namespaceStatusStore,
} }
coreGroupMeta := registered.GroupOrDie(core.GroupName) coreGroupMeta := registered.GroupOrDie(core.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{ apiGroupInfo := genericapiserver.APIGroupInfo{