Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

federation: Fixing runtime-config support for federation-apiserver #42225

Merged
merged 3 commits into from Apr 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions federation/cmd/federation-apiserver/app/BUILD
Expand Up @@ -15,6 +15,7 @@ go_library(
"core.go",
"extensions.go",
"federation.go",
"install.go",
"plugins.go",
"server.go",
],
Expand All @@ -25,16 +26,21 @@ go_library(
"//federation/apis/core/v1:go_default_library",
"//federation/apis/federation:go_default_library",
"//federation/apis/federation/install:go_default_library",
"//federation/apis/federation/v1beta1:go_default_library",
"//federation/cmd/federation-apiserver/app/options:go_default_library",
"//federation/registry/cluster/etcd:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api/install:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/autoscaling/install:go_default_library",
"//pkg/apis/autoscaling/v1:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/batch/install:go_default_library",
"//pkg/apis/batch/v1:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/install:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/client/informers/informers_generated/internalversion:go_default_library",
"//pkg/cloudprovider/providers:go_default_library",
Expand Down
24 changes: 17 additions & 7 deletions federation/cmd/federation-apiserver/app/autoscaling.go
Expand Up @@ -21,24 +21,34 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/autoscaling"
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
hpastorage "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage"
)

func installAutoscalingAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {
hpaStorage, hpaStatusStorage := hpastorage.NewREST(optsGetter)

autoscalingResources := map[string]rest.Storage{
"horizontalpodautoscalers": hpaStorage,
"horizontalpodautoscalers/status": hpaStatusStorage,
func installAutoscalingAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter, apiResourceConfigSource storage.APIResourceConfigSource) {
hpaStorageFn := func() map[string]rest.Storage {
hpaStorage, hpaStatusStorage := hpastorage.NewREST(optsGetter)
return map[string]rest.Storage{
"horizontalpodautoscalers": hpaStorage,
"horizontalpodautoscalers/status": hpaStatusStorage,
}
}
resourcesStorageMap := map[string]getResourcesStorageFunc{
"horizontalpodautoscalers": hpaStorageFn,
}
shouldInstallGroup, resources := enabledResources(autoscalingv1.SchemeGroupVersion, resourcesStorageMap, apiResourceConfigSource)
if !shouldInstallGroup {
return
}
autoscalingGroupMeta := api.Registry.GroupOrDie(autoscaling.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *autoscalingGroupMeta,
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1": autoscalingResources,
"v1": resources,
},
OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
Scheme: api.Scheme,
Expand Down
24 changes: 17 additions & 7 deletions federation/cmd/federation-apiserver/app/batch.go
Expand Up @@ -21,24 +21,34 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/batch"
_ "k8s.io/kubernetes/pkg/apis/batch/install"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage"
)

func installBatchAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {
jobStorage := jobstorage.NewStorage(optsGetter)

batchResources := map[string]rest.Storage{
"jobs": jobStorage.Job,
"jobs/status": jobStorage.Status,
func installBatchAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter, apiResourceConfigSource storage.APIResourceConfigSource) {
jobsStorageFn := func() map[string]rest.Storage {
jobStorage := jobstorage.NewStorage(optsGetter)
return map[string]rest.Storage{
"jobs": jobStorage.Job,
"jobs/status": jobStorage.Status,
}
}
resourcesStorageMap := map[string]getResourcesStorageFunc{
"jobs": jobsStorageFn,
}
shouldInstallGroup, resources := enabledResources(batchv1.SchemeGroupVersion, resourcesStorageMap, apiResourceConfigSource)
if !shouldInstallGroup {
return
}
batchGroupMeta := api.Registry.GroupOrDie(batch.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *batchGroupMeta,
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1": batchResources,
"v1": resources,
},
OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
Scheme: api.Scheme,
Expand Down
65 changes: 47 additions & 18 deletions federation/cmd/federation-apiserver/app/core.go
Expand Up @@ -29,9 +29,10 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/federation/apis/core"
_ "k8s.io/kubernetes/federation/apis/core/install"
"k8s.io/kubernetes/federation/apis/core/v1"
corev1 "k8s.io/kubernetes/federation/apis/core/v1"
"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
"k8s.io/kubernetes/pkg/api"
configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage"
Expand All @@ -41,28 +42,56 @@ import (
servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage"
)

func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {
serviceStore, serviceStatusStore := servicestore.NewREST(optsGetter)
namespaceStore, namespaceStatusStore, namespaceFinalizeStore := namespacestore.NewREST(optsGetter)
secretStore := secretstore.NewREST(optsGetter)
configMapStore := configmapstore.NewREST(optsGetter)
eventStore := eventstore.NewREST(optsGetter, uint64(s.EventTTL.Seconds()))

coreResources := map[string]rest.Storage{
"secrets": secretStore,
"services": serviceStore,
"services/status": serviceStatusStore,
"namespaces": namespaceStore,
"namespaces/status": namespaceStatusStore,
"namespaces/finalize": namespaceFinalizeStore,
"events": eventStore,
"configmaps": configMapStore,
func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter, apiResourceConfigSource storage.APIResourceConfigSource) {
servicesStorageFn := func() map[string]rest.Storage {
serviceStore, serviceStatusStore := servicestore.NewREST(optsGetter)
return map[string]rest.Storage{
"services": serviceStore,
"services/status": serviceStatusStore,
}
}
namespacesStorageFn := func() map[string]rest.Storage {
namespaceStore, namespaceStatusStore, namespaceFinalizeStore := namespacestore.NewREST(optsGetter)
return map[string]rest.Storage{
"namespaces": namespaceStore,
"namespaces/status": namespaceStatusStore,
"namespaces/finalize": namespaceFinalizeStore,
}
}
secretsStorageFn := func() map[string]rest.Storage {
secretStore := secretstore.NewREST(optsGetter)
return map[string]rest.Storage{
"secrets": secretStore,
}
}
configmapsStorageFn := func() map[string]rest.Storage {
configMapStore := configmapstore.NewREST(optsGetter)
return map[string]rest.Storage{
"configmaps": configMapStore,
}
}
eventsStorageFn := func() map[string]rest.Storage {
eventStore := eventstore.NewREST(optsGetter, uint64(s.EventTTL.Seconds()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these having any side effects? Or why are they a func and not just vars?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no side effect. same as above

return map[string]rest.Storage{
"events": eventStore,
}
}
resourcesStorageMap := map[string]getResourcesStorageFunc{
"services": servicesStorageFn,
"namespaces": namespacesStorageFn,
"secrets": secretsStorageFn,
"configmaps": configmapsStorageFn,
"events": eventsStorageFn,
}
shouldInstallGroup, resources := enabledResources(corev1.SchemeGroupVersion, resourcesStorageMap, apiResourceConfigSource)
if !shouldInstallGroup {
return
}
coreGroupMeta := api.Registry.GroupOrDie(core.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *coreGroupMeta,
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
v1.SchemeGroupVersion.Version: coreResources,
corev1.SchemeGroupVersion.Version: resources,
},
OptionsExternalVersion: &api.Registry.GroupOrDie(core.GroupName).GroupVersion,
Scheme: core.Scheme,
Expand Down
63 changes: 44 additions & 19 deletions federation/cmd/federation-apiserver/app/extensions.go
Expand Up @@ -21,39 +21,64 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage"
deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage"
ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage"
replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage"
)

func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {
replicaSetStorage := replicasetstore.NewStorage(optsGetter)
deploymentStorage := deploymentstore.NewStorage(optsGetter)
ingressStorage, ingressStatusStorage := ingressstore.NewREST(optsGetter)
daemonSetStorage, daemonSetStatusStorage := daemonsetstore.NewREST(optsGetter)

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,
"deployments": deploymentStorage.Deployment,
"deployments/status": deploymentStorage.Status,
"deployments/scale": deploymentStorage.Scale,
"deployments/rollback": deploymentStorage.Rollback,
func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter, apiResourceConfigSource storage.APIResourceConfigSource) {
replicasetsStorageFn := func() map[string]rest.Storage {
replicaSetStorage := replicasetstore.NewStorage(optsGetter)
return map[string]rest.Storage{
"replicasets": replicaSetStorage.ReplicaSet,
"replicasets/status": replicaSetStorage.Status,
"replicasets/scale": replicaSetStorage.Scale,
}
}
deploymentsStorageFn := func() map[string]rest.Storage {
deploymentStorage := deploymentstore.NewStorage(optsGetter)
return map[string]rest.Storage{
"deployments": deploymentStorage.Deployment,
"deployments/status": deploymentStorage.Status,
"deployments/scale": deploymentStorage.Scale,
"deployments/rollback": deploymentStorage.Rollback,
}
}
ingressesStorageFn := func() map[string]rest.Storage {
ingressStorage, ingressStatusStorage := ingressstore.NewREST(optsGetter)
return map[string]rest.Storage{
"ingresses": ingressStorage,
"ingresses/status": ingressStatusStorage,
}
}
daemonsetsStorageFn := func() map[string]rest.Storage {
daemonSetStorage, daemonSetStatusStorage := daemonsetstore.NewREST(optsGetter)
return map[string]rest.Storage{
"daemonsets": daemonSetStorage,
"daemonsets/status": daemonSetStatusStorage,
}
}
resourcesStorageMap := map[string]getResourcesStorageFunc{
"replicasets": replicasetsStorageFn,
"deployments": deploymentsStorageFn,
"ingresses": ingressesStorageFn,
"daemonsets": daemonsetsStorageFn,
}
shouldInstallGroup, resources := enabledResources(extensionsv1beta1.SchemeGroupVersion, resourcesStorageMap, apiResourceConfigSource)
if !shouldInstallGroup {
return
}
extensionsGroupMeta := api.Registry.GroupOrDie(extensions.GroupName)
apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *extensionsGroupMeta,
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1beta1": extensionsResources,
"v1beta1": resources,
},
OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
Scheme: api.Scheme,
Expand Down
29 changes: 20 additions & 9 deletions federation/cmd/federation-apiserver/app/federation.go
Expand Up @@ -22,24 +22,35 @@ import (
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/storage"
"k8s.io/kubernetes/federation/apis/federation"
"k8s.io/kubernetes/pkg/api"

_ "k8s.io/kubernetes/federation/apis/federation/install"
fedv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
clusteretcd "k8s.io/kubernetes/federation/registry/cluster/etcd"
"k8s.io/kubernetes/pkg/api"
)

func installFederationAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) {
clusterStorage, clusterStatusStorage := clusteretcd.NewREST(optsGetter)
federationResources := map[string]rest.Storage{
"clusters": clusterStorage,
"clusters/status": clusterStatusStorage,
func installFederationAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter, apiResourceConfigSource storage.APIResourceConfigSource) {
groupName := federation.GroupName
clustersStorageFn := func() map[string]rest.Storage {
clusterStorage, clusterStatusStorage := clusteretcd.NewREST(optsGetter)
return map[string]rest.Storage{
"clusters": clusterStorage,
"clusters/status": clusterStatusStorage,
}
}
resourcesStorageMap := map[string]getResourcesStorageFunc{
"clusters": clustersStorageFn,
}
shouldInstallGroup, resources := enabledResources(fedv1beta1.SchemeGroupVersion, resourcesStorageMap, apiResourceConfigSource)
if !shouldInstallGroup {
return
}
federationGroupMeta := api.Registry.GroupOrDie(federation.GroupName)
federationGroupMeta := api.Registry.GroupOrDie(groupName)
apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *federationGroupMeta,
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1beta1": federationResources,
"v1beta1": resources,
},
OptionsExternalVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
Scheme: api.Scheme,
Expand Down
55 changes: 55 additions & 0 deletions federation/cmd/federation-apiserver/app/install.go
@@ -0,0 +1,55 @@
/*
Copyright 2017 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package app

import (
"github.com/golang/glog"

"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/server/storage"
)

// Function to get a map of resources and the corresponding storages.
type getResourcesStorageFunc func() map[string]rest.Storage

// Filters the resources from the given resources storage map to those that are enabled in the given apiResourceConfigSource.
// resourcesStorageMap is expected to contain all resources in a group version.
// Returns false if none of the resources are enabled and hence the whole group version should be disabled.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the bool is equivalent to len(enabledResources) == 0 ? I would just remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isnt it better to keep that logic in this function rather than requiring all callers to do that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have a point, this was meant to keep the other code clean. I am fine with it.

func enabledResources(groupVersion schema.GroupVersion, resourcesStorageMap map[string]getResourcesStorageFunc, apiResourceConfigSource storage.APIResourceConfigSource) (bool, map[string]rest.Storage) {
enabledResources := map[string]rest.Storage{}
groupName := groupVersion.Group
if !apiResourceConfigSource.AnyResourcesForGroupEnabled(groupName) {
glog.V(1).Infof("Skipping disabled API group %q", groupName)
return false, enabledResources
}
for resource, fn := range resourcesStorageMap {
if apiResourceConfigSource.ResourceEnabled(groupVersion.WithResource(resource)) {
resources := fn()
for k, v := range resources {
enabledResources[k] = v
}
} else {
glog.V(1).Infof("Skipping disabled resource %s in API group %q", resource, groupName)
}
}
if len(enabledResources) == 0 {
glog.V(1).Infof("Skipping API group %q since there is no enabled resource", groupName)
return false, enabledResources
}
return true, enabledResources
}