From 545cfb1a6fc4d8c9ea3dd03acf264fe10a4acda8 Mon Sep 17 00:00:00 2001
From: Marcin Wielgus <mwielgus@google.com>
Date: Mon, 17 Oct 2016 23:58:01 +0200
Subject: [PATCH] Add configmaps to federation apiserver

---
 federation/apis/core/register.go                | 2 ++
 federation/apis/core/v1/register.go             | 2 ++
 federation/cmd/federation-apiserver/app/core.go | 3 +++
 test/integration/federation/server_test.go      | 7 ++++++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/federation/apis/core/register.go b/federation/apis/core/register.go
index 13269045081..49300dce857 100644
--- a/federation/apis/core/register.go
+++ b/federation/apis/core/register.go
@@ -72,6 +72,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&api.SecretList{},
 		&api.Event{},
 		&api.EventList{},
+		&api.ConfigMap{},
+		&api.ConfigMapList{},
 	)
 
 	// Register Unversioned types under their own special group
diff --git a/federation/apis/core/v1/register.go b/federation/apis/core/v1/register.go
index df3191ec3ee..ad2aa8df1f3 100644
--- a/federation/apis/core/v1/register.go
+++ b/federation/apis/core/v1/register.go
@@ -47,6 +47,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&v1.SecretList{},
 		&v1.Event{},
 		&v1.EventList{},
+		&v1.ConfigMap{},
+		&v1.ConfigMapList{},
 	)
 
 	// Add common types
diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go
index 1cd70d94e40..6501f48a886 100644
--- a/federation/cmd/federation-apiserver/app/core.go
+++ b/federation/cmd/federation-apiserver/app/core.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/genericapiserver"
+	configmapetcd "k8s.io/kubernetes/pkg/registry/core/configmap/etcd"
 	eventetcd "k8s.io/kubernetes/pkg/registry/core/event/etcd"
 	namespaceetcd "k8s.io/kubernetes/pkg/registry/core/namespace/etcd"
 	secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
@@ -44,6 +45,7 @@ func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPI
 	serviceStore, serviceStatusStore := serviceetcd.NewREST(restOptionsFactory.NewFor(api.Resource("service")))
 	namespaceStore, namespaceStatusStore, namespaceFinalizeStore := namespaceetcd.NewREST(restOptionsFactory.NewFor(api.Resource("namespaces")))
 	secretStore := secretetcd.NewREST(restOptionsFactory.NewFor(api.Resource("secrets")))
+	configMapStore := configmapetcd.NewREST(restOptionsFactory.NewFor(api.Resource("configmaps")))
 	eventStore := eventetcd.NewREST(restOptionsFactory.NewFor(api.Resource("events")), uint64(s.EventTTL.Seconds()))
 	coreResources := map[string]rest.Storage{
 		"secrets":             secretStore,
@@ -53,6 +55,7 @@ func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPI
 		"namespaces/status":   namespaceStatusStore,
 		"namespaces/finalize": namespaceFinalizeStore,
 		"events":              eventStore,
+		"configmaps":          configMapStore,
 	}
 	coreGroupMeta := registered.GroupOrDie(core.GroupName)
 	apiGroupInfo := genericapiserver.APIGroupInfo{
diff --git a/test/integration/federation/server_test.go b/test/integration/federation/server_test.go
index c0e4d3e62fb..90d12c45e4d 100644
--- a/test/integration/federation/server_test.go
+++ b/test/integration/federation/server_test.go
@@ -284,7 +284,7 @@ func testCoreResourceList(t *testing.T) {
 	assert.Equal(t, "", apiResourceList.APIVersion)
 	assert.Equal(t, v1.SchemeGroupVersion.String(), apiResourceList.GroupVersion)
 	// Assert that there are exactly 7 resources.
-	assert.Equal(t, 7, len(apiResourceList.APIResources))
+	assert.Equal(t, 8, len(apiResourceList.APIResources))
 
 	// Verify services.
 	found := findResource(apiResourceList.APIResources, "services")
@@ -314,6 +314,11 @@ func testCoreResourceList(t *testing.T) {
 	found = findResource(apiResourceList.APIResources, "secrets")
 	assert.NotNil(t, found)
 	assert.True(t, found.Namespaced)
+
+	// Verify config maps.
+	found = findResource(apiResourceList.APIResources, "configmaps")
+	assert.NotNil(t, found)
+	assert.True(t, found.Namespaced)
 }
 
 func testExtensionsResourceList(t *testing.T) {