TODO

Resolve NonDefaultGroupVersions Adjust controller start to trigger off resource/group enablement (EnableExp is gone)
soltysh · Jan 19, 2016 · 51c0716 · 51c0716
1 parent 29b7542
commit 51c0716
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pkg/cmd/server/origin/master.go b/pkg/cmd/server/origin/master.go
@@ -565,9 +565,9 @@ func (c *MasterConfig) defaultAPIGroupVersion() *apiserver.APIGroupVersion {
  Convertor: kapi.Scheme,
  Linker: latest.SelfLinker,
 
- Admit:  c.AdmissionControl,
- Context:  c.getRequestContextMapper(),
- NonDefaultGroupVersions: map[string]string{},
+ Admit: c.AdmissionControl,
+ Context: c.getRequestContextMapper(),
+ // TODO: NonDefaultGroupVersions: map[string]string{},
  }
 }
 
@@ -585,7 +585,7 @@ func (c *MasterConfig) api_v1beta3(all map[string]rest.Storage) *apiserver.APIGr
  version.Storage = storage
  version.GroupVersion = unversioned.GroupVersion{Group: "", Version: OpenShiftAPIV1Beta3}
  version.Codec = v1beta3.Codec
- version.NonDefaultGroupVersions["deploymentconfigs/scale"] = "extensions/v1beta1"
+ // TODO: version.NonDefaultGroupVersions["deploymentconfigs/scale"] = "extensions/v1beta1"
  return version
 }
 
@@ -602,7 +602,7 @@ func (c *MasterConfig) api_v1(all map[string]rest.Storage) *apiserver.APIGroupVe
  version.Storage = storage
  version.GroupVersion = unversioned.GroupVersion{Group: "", Version: OpenShiftAPIV1}
  version.Codec = v1.Codec
- version.NonDefaultGroupVersions["deploymentconfigs/scale"] = "extensions/v1beta1"
+ // TODO: version.NonDefaultGroupVersions["deploymentconfigs/scale"] = "extensions/v1beta1"
  return version
 }
 

diff --git a/pkg/cmd/server/start/start_master.go b/pkg/cmd/server/start/start_master.go
@@ -550,7 +550,8 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro
  kc.RunNodeController()
  kc.RunScheduler()
  kc.RunReplicationController(rcClient)
- if kc.Master.EnableExp {
+ // TODO: detect or replace kc.Master.EnableExp
+ if true {
  kc.RunJobController(jobClient)
  kc.RunHPAController(hpaOClient, hpaKClient, oc.Options.PolicyConfig.OpenShiftInfrastructureNamespace)
  }