From 89a75e2a85d074eca1cc4367c6f7945392d31543 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Thu, 4 Aug 2016 15:26:38 -0700 Subject: [PATCH] Adding ingress to federation apiserver --- federation/cmd/federation-apiserver/app/extensions.go | 4 ++++ federation/cmd/federation-apiserver/app/server_test.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 4c5cd0be421..7b7d463d365 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -26,15 +26,19 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" + ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd" replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd" ) func installExtensionsAPIs(s *genericoptions.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) { 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{ "replicasets": replicaSetStorage.ReplicaSet, "replicasets/status": replicaSetStorage.Status, "replicasets/scale": replicaSetStorage.Scale, + "ingresses": ingressStorage, + "ingresses/status": ingressStatusStorage, } extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName) apiGroupInfo := genericapiserver.APIGroupInfo{ diff --git a/federation/cmd/federation-apiserver/app/server_test.go b/federation/cmd/federation-apiserver/app/server_test.go index da3dfc0d486..3a5679f2fdc 100644 --- a/federation/cmd/federation-apiserver/app/server_test.go +++ b/federation/cmd/federation-apiserver/app/server_test.go @@ -304,6 +304,7 @@ func testExtensionsResourceList(t *testing.T) { assert.Equal(t, "", apiResourceList.APIVersion) assert.Equal(t, ext_v1b1.SchemeGroupVersion.String(), apiResourceList.GroupVersion) + // Verify replicasets. found := findResource(apiResourceList.APIResources, "replicasets") assert.NotNil(t, found) assert.True(t, found.Namespaced) @@ -313,4 +314,12 @@ func testExtensionsResourceList(t *testing.T) { found = findResource(apiResourceList.APIResources, "replicasets/scale") assert.NotNil(t, found) 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) }