github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12217 from mwielgus/exp_scale

Browse Source 
Experimental Scale subresource
This commit is contained in:
Marek Grabowski
2015-08-10 16:32:59 +02:00
parent d239d51f3a 91584c6b3b
commit 87250d075f
8 changed files with 376 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/master/master.go
View File

@@ -55,6 +55,7 @@ import (
endpointsetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd"
"k8s.io/kubernetes/pkg/registry/etcd"
"k8s.io/kubernetes/pkg/registry/event"
expcontrolleretcd "k8s.io/kubernetes/pkg/registry/experimental/controller/etcd"
"k8s.io/kubernetes/pkg/registry/limitrange"
"k8s.io/kubernetes/pkg/registry/minion"
nodeetcd "k8s.io/kubernetes/pkg/registry/minion/etcd"
@@ -777,7 +778,13 @@ func (m *Master) api_v1() *apiserver.APIGroupVersion {
// expapi returns the resources and codec for the experimental api
func (m *Master) expapi(c *Config) *apiserver.APIGroupVersion {
storage := map[string]rest.Storage{}
controllerStorage := expcontrolleretcd.NewStorage(c.DatabaseStorage)
storage := map[string]rest.Storage{
strings.ToLower("replicationControllers"): controllerStorage.ReplicationController,
strings.ToLower("replicationControllers/scaler"): controllerStorage.Scale,
}
return &apiserver.APIGroupVersion{
Root: m.expAPIPrefix,