From 7f472510bfbd884e02b51bb5b21d716e8ec58849 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Thu, 6 Oct 2016 17:13:43 +0200 Subject: [PATCH] Add deployments to federation apiserver --- .../federation-apiserver/app/extensions.go | 20 ++++++++++++------- test/integration/federation/server_test.go | 16 +++++++++++++-- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index b9cc5fb30d4..d101b38b91f 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -25,23 +25,29 @@ import ( _ "k8s.io/kubernetes/pkg/apis/extensions/install" "k8s.io/kubernetes/pkg/genericapiserver" daemonsetetcd "k8s.io/kubernetes/pkg/registry/extensions/daemonset/etcd" + deploymentetcd "k8s.io/kubernetes/pkg/registry/extensions/deployment/etcd" ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd" replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" ) func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, restOptionsFactory restOptionsFactory) { replicaSetStorage := replicasetetcd.NewStorage(restOptionsFactory.NewFor(extensions.Resource("replicasets"))) + deploymentStorage := deploymentetcd.NewStorage(restOptionsFactory.NewFor(extensions.Resource("deployments"))) 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, + "replicasets": replicaSetStorage.ReplicaSet, + "replicasets/status": replicaSetStorage.Status, + "replicasets/scale": replicaSetStorage.Scale, + "ingresses": ingressStorage, + "ingresses/status": ingressStatusStorage, + "daemonsets": daemonSetStorage, + "daemonsets/status": daemonSetStatusStorage, + "deployments": deploymentStorage.Deployment, + "deployments/status": deploymentStorage.Status, + "deployments/scale": deploymentStorage.Scale, + "deployments/rollback": deploymentStorage.Rollback, } 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 44dad97f762..c0e4d3e62fb 100644 --- a/test/integration/federation/server_test.go +++ b/test/integration/federation/server_test.go @@ -330,8 +330,8 @@ func testExtensionsResourceList(t *testing.T) { // empty APIVersion for extensions group assert.Equal(t, "", apiResourceList.APIVersion) assert.Equal(t, ext_v1b1.SchemeGroupVersion.String(), apiResourceList.GroupVersion) - // Assert that there are exactly 5 resources. - assert.Equal(t, 7, len(apiResourceList.APIResources)) + // Assert that there are exactly 11 resources. + assert.Equal(t, 11, len(apiResourceList.APIResources)) // Verify replicasets. found := findResource(apiResourceList.APIResources, "replicasets") @@ -359,4 +359,16 @@ func testExtensionsResourceList(t *testing.T) { found = findResource(apiResourceList.APIResources, "daemonsets/status") assert.NotNil(t, found) assert.True(t, found.Namespaced) + + // Verify deployments. + found = findResource(apiResourceList.APIResources, "deployments") + assert.NotNil(t, found) + assert.True(t, found.Namespaced) + found = findResource(apiResourceList.APIResources, "deployments/status") + assert.NotNil(t, found) + assert.True(t, found.Namespaced) + found = findResource(apiResourceList.APIResources, "deployments/scale") + assert.NotNil(t, found) + assert.True(t, found.Namespaced) + found = findResource(apiResourceList.APIResources, "deployments/rollback") }