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

Merge pull request #34245 from mwielgus/fed-api-daemons

Browse Source 
Automatic merge from submit-queue

DaemonSets in federated apiserver

cc: @quinton-hoole @nikhiljindal
This commit is contained in:
Kubernetes Submit Queue 2016-10-10 23:53:57 -07:00 committed by GitHub
commit b3a9671cb8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import (
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
_ "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"
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"
) )
@ -31,12 +32,16 @@ import (
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")))
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")))
extensionsResources := map[string]rest.Storage{ extensionsResources := map[string]rest.Storage{
"replicasets": replicaSetStorage.ReplicaSet, "replicasets": replicaSetStorage.ReplicaSet,
"replicasets/status": replicaSetStorage.Status, "replicasets/status": replicaSetStorage.Status,
"replicasets/scale": replicaSetStorage.Scale, "replicasets/scale": replicaSetStorage.Scale,
"ingresses": ingressStorage, "ingresses": ingressStorage,
"ingresses/status": ingressStatusStorage, "ingresses/status": ingressStatusStorage,
"daemonsets": daemonSetStorage,
"daemonsets/status": daemonSetStatusStorage,
} }
extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName) extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{ apiGroupInfo := genericapiserver.APIGroupInfo{

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

@ -331,7 +331,7 @@ func testExtensionsResourceList(t *testing.T) {
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 5 resources.
assert.Equal(t, 5, len(apiResourceList.APIResources)) assert.Equal(t, 7, len(apiResourceList.APIResources))
// Verify replicasets. // Verify replicasets.
found := findResource(apiResourceList.APIResources, "replicasets") found := findResource(apiResourceList.APIResources, "replicasets")
@ -351,4 +351,12 @@ func testExtensionsResourceList(t *testing.T) {
found = findResource(apiResourceList.APIResources, "ingresses/status") found = findResource(apiResourceList.APIResources, "ingresses/status")
assert.NotNil(t, found) assert.NotNil(t, found)
assert.True(t, found.Namespaced) 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)
} }