github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Add deployments to federation apiserver

Browse Source
This commit is contained in:
Marcin Wielgus 2016-10-06 17:13:43 +02:00
parent 0b627334df
commit 7f472510bf
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,14 @@ import (
_ "k8s.io/kubernetes/pkg/apis/extensions/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install"
"k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver"
daemonsetetcd "k8s.io/kubernetes/pkg/registry/extensions/daemonset/etcd" 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" ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd"
replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd"
) )
func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, restOptionsFactory restOptionsFactory) { func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, restOptionsFactory restOptionsFactory) {
replicaSetStorage := replicasetetcd.NewStorage(restOptionsFactory.NewFor(extensions.Resource("replicasets"))) 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"))) ingressStorage, ingressStatusStorage := ingressetcd.NewREST(restOptionsFactory.NewFor(extensions.Resource("ingresses")))
daemonSetStorage, daemonSetStatusStorage := daemonsetetcd.NewREST(restOptionsFactory.NewFor(extensions.Resource("daemonsets"))) daemonSetStorage, daemonSetStatusStorage := daemonsetetcd.NewREST(restOptionsFactory.NewFor(extensions.Resource("daemonsets")))
@ -42,6 +44,10 @@ func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, restOptionsFact
"ingresses/status": ingressStatusStorage, "ingresses/status": ingressStatusStorage,
"daemonsets": daemonSetStorage, "daemonsets": daemonSetStorage,
"daemonsets/status": daemonSetStatusStorage, "daemonsets/status": daemonSetStatusStorage,
"deployments": deploymentStorage.Deployment,
"deployments/status": deploymentStorage.Status,
"deployments/scale": deploymentStorage.Scale,
"deployments/rollback": deploymentStorage.Rollback,
} }
extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName) extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{ apiGroupInfo := genericapiserver.APIGroupInfo{

16
test/integration/federation/server_test.go
View File

@ -330,8 +330,8 @@ func testExtensionsResourceList(t *testing.T) {
// empty APIVersion for extensions group // empty APIVersion for extensions group
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)
// Assert that there are exactly 5 resources. // Assert that there are exactly 11 resources.
assert.Equal(t, 7, len(apiResourceList.APIResources)) assert.Equal(t, 11, len(apiResourceList.APIResources))
// Verify replicasets. // Verify replicasets.
found := findResource(apiResourceList.APIResources, "replicasets") found := findResource(apiResourceList.APIResources, "replicasets")
@ -359,4 +359,16 @@ func testExtensionsResourceList(t *testing.T) {
found = findResource(apiResourceList.APIResources, "daemonsets/status") found = findResource(apiResourceList.APIResources, "daemonsets/status")
assert.NotNil(t, found) assert.NotNil(t, found)
assert.True(t, found.Namespaced) 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")
} }