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

Adding ingress to federation apiserver

Browse Source
This commit is contained in:
nikhiljindal 2016-08-04 15:26:38 -07:00
parent 807241b84f
commit 89a75e2a85
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,15 +26,19 @@ import (
"k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
_ "k8s.io/kubernetes/pkg/apis/extensions/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install"
ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd"
replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd" replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd"
) )
func installExtensionsAPIs(s *genericoptions.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) { func installExtensionsAPIs(s *genericoptions.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) {
replicaSetStorage := replicasetetcd.NewStorage(createRESTOptionsOrDie(s, g, f, extensions.Resource("replicasets"))) replicaSetStorage := replicasetetcd.NewStorage(createRESTOptionsOrDie(s, g, f, extensions.Resource("replicasets")))
ingressStorage, ingressStatusStorage := ingressetcd.NewREST(createRESTOptionsOrDie(s, g, f, extensions.Resource("ingresses")))
extensionsResources := map[string]rest.Storage{ extensionsResources := map[string]rest.Storage{
"replicasets": replicaSetStorage.ReplicaSet, "replicasets": replicaSetStorage.ReplicaSet,
"replicasets/status": replicaSetStorage.Status, "replicasets/status": replicaSetStorage.Status,
"replicasets/scale": replicaSetStorage.Scale, "replicasets/scale": replicaSetStorage.Scale,
"ingresses": ingressStorage,
"ingresses/status": ingressStatusStorage,
} }
extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName) extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{ apiGroupInfo := genericapiserver.APIGroupInfo{

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

@ -304,6 +304,7 @@ func testExtensionsResourceList(t *testing.T) {
assert.Equal(t, "", apiResourceList.APIVersion) assert.Equal(t, "", apiResourceList.APIVersion)
assert.Equal(t, ext_v1b1.SchemeGroupVersion.String(), apiResourceList.GroupVersion) assert.Equal(t, ext_v1b1.SchemeGroupVersion.String(), apiResourceList.GroupVersion)
// Verify replicasets.
found := findResource(apiResourceList.APIResources, "replicasets") found := findResource(apiResourceList.APIResources, "replicasets")
assert.NotNil(t, found) assert.NotNil(t, found)
assert.True(t, found.Namespaced) assert.True(t, found.Namespaced)
@ -313,4 +314,12 @@ func testExtensionsResourceList(t *testing.T) {
found = findResource(apiResourceList.APIResources, "replicasets/scale") found = findResource(apiResourceList.APIResources, "replicasets/scale")
assert.NotNil(t, found) assert.NotNil(t, found)
assert.True(t, found.Namespaced) assert.True(t, found.Namespaced)
// Verify ingress.
found = findResource(apiResourceList.APIResources, "ingresses")
assert.NotNil(t, found)
assert.True(t, found.Namespaced)
found = findResource(apiResourceList.APIResources, "ingresses/status")
assert.NotNil(t, found)
assert.True(t, found.Namespaced)
} }