diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index bd2bcd04dd9..b9cc5fb30d4 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -24,6 +24,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" "k8s.io/kubernetes/pkg/genericapiserver" + daemonsetetcd "k8s.io/kubernetes/pkg/registry/extensions/daemonset/etcd" ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd" replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" ) @@ -31,12 +32,16 @@ import ( func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, restOptionsFactory restOptionsFactory) { replicaSetStorage := replicasetetcd.NewStorage(restOptionsFactory.NewFor(extensions.Resource("replicasets"))) ingressStorage, ingressStatusStorage := ingressetcd.NewREST(restOptionsFactory.NewFor(extensions.Resource("ingresses"))) + daemonSetStorage, daemonSetStatusStorage := daemonsetetcd.NewREST(restOptionsFactory.NewFor(extensions.Resource("daemonsets"))) + extensionsResources := map[string]rest.Storage{ "replicasets": replicaSetStorage.ReplicaSet, "replicasets/status": replicaSetStorage.Status, "replicasets/scale": replicaSetStorage.Scale, "ingresses": ingressStorage, "ingresses/status": ingressStatusStorage, + "daemonsets": daemonSetStorage, + "daemonsets/status": daemonSetStatusStorage, } extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName) apiGroupInfo := genericapiserver.APIGroupInfo{ diff --git a/test/integration/federation/server_test.go b/test/integration/federation/server_test.go index 8a6c5f4c200..44dad97f762 100644 --- a/test/integration/federation/server_test.go +++ b/test/integration/federation/server_test.go @@ -331,7 +331,7 @@ func testExtensionsResourceList(t *testing.T) { assert.Equal(t, "", apiResourceList.APIVersion) assert.Equal(t, ext_v1b1.SchemeGroupVersion.String(), apiResourceList.GroupVersion) // Assert that there are exactly 5 resources. - assert.Equal(t, 5, len(apiResourceList.APIResources)) + assert.Equal(t, 7, len(apiResourceList.APIResources)) // Verify replicasets. found := findResource(apiResourceList.APIResources, "replicasets") @@ -351,4 +351,12 @@ func testExtensionsResourceList(t *testing.T) { found = findResource(apiResourceList.APIResources, "ingresses/status") assert.NotNil(t, found) assert.True(t, found.Namespaced) + + // Verify daemonsets. + found = findResource(apiResourceList.APIResources, "daemonsets") + assert.NotNil(t, found) + assert.True(t, found.Namespaced) + found = findResource(apiResourceList.APIResources, "daemonsets/status") + assert.NotNil(t, found) + assert.True(t, found.Namespaced) }