Merge pull request #16088 from deads2k/controller-09-disable-hpa

Automatic merge from submit-queue (batch tested with PRs 15995, 16094, 16088)

stop overwriting the HPA controller and just write our own

This removes the last customization of the upstream controller init functions, disables the kube hpa init, and runs our own hpa init

Author: openshift-merge-robot

Diff for: pkg/cmd/server/kubernetes/master/controller/config.go

@@ -7,7 +7,6 @@ import (
 	osclient "github.com/openshift/origin/pkg/client"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	clientgoclientset "k8s.io/client-go/kubernetes"
-	kubecontroller "k8s.io/kubernetes/cmd/kube-controller-manager/app"
 	kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
 
@@ -18,7 +17,9 @@ type HorizontalPodAutoscalerControllerConfig struct {
 	HeapsterNamespace string
 }
 
-func (c *HorizontalPodAutoscalerControllerConfig) RunController(ctx kubecontroller.ControllerContext) (bool, error) {
+func (c *HorizontalPodAutoscalerControllerConfig) RunController(originCtx ControllerContext) (bool, error) {
+	ctx := originCtx.KubeControllerContext
+
 	hpaClientConfig := ctx.ClientBuilder.ConfigOrDie(bootstrappolicy.InfraHorizontalPodAutoscalerControllerServiceAccountName)
 
 	hpaClient, err := kubeclientset.NewForConfig(hpaClientConfig)

Diff for: pkg/cmd/server/kubernetes/master/controller/hpa.go renamed to pkg/cmd/server/origin/controller/autoscaling.go

@@ -58,6 +58,8 @@ type OpenshiftControllerConfig struct {
 	IngressIPControllerConfig IngressIPControllerConfig
 
 	ClusterQuotaReconciliationControllerConfig ClusterQuotaReconciliationControllerConfig
+
+	HorizontalPodAutoscalerControllerConfig HorizontalPodAutoscalerControllerConfig
 }
 
 func (c *OpenshiftControllerConfig) GetControllerInitializers() (map[string]InitFunc, error) {
@@ -88,6 +90,10 @@ func (c *OpenshiftControllerConfig) GetControllerInitializers() (map[string]Init
 	ret["openshift.io/resourcequota"] = RunResourceQuotaManager
 	ret["openshift.io/cluster-quota-reconciliation"] = c.ClusterQuotaReconciliationControllerConfig.RunController
 
+	// overrides the Kube HPA controller config, so that we can point it at an HTTPS Heapster
+	// in openshift-infra, and pass it a scale client that knows how to scale DCs
+	ret["openshift.io/horizontalpodautoscaling"] = c.HorizontalPodAutoscalerControllerConfig.RunController
+
 	return ret, nil
 }
 
@@ -218,5 +224,10 @@ func BuildOpenshiftControllerConfig(options configapi.MasterConfig) (*OpenshiftC
 		DefaultReplenishmentSyncPeriod: 12 * time.Hour,
 	}
 
+	// TODO this goes away with a truly generic autoscaler
+	ret.HorizontalPodAutoscalerControllerConfig = HorizontalPodAutoscalerControllerConfig{
+		HeapsterNamespace: options.PolicyConfig.OpenShiftInfrastructureNamespace,
+	}
+
 	return ret, nil
 }

Diff for: pkg/cmd/server/origin/controller/config.go

@@ -1,4 +1,4 @@
-package controller
+package start
 
 import (
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

Diff for: pkg/cmd/server/kubernetes/master/controller/volumes.go renamed to pkg/cmd/server/start/start_kube_controller_manager.go

@@ -27,13 +27,15 @@ import (
 	clientgoclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 	aggregatorinstall "k8s.io/kube-aggregator/pkg/apis/apiregistration/install"
+	kubecontroller "k8s.io/kubernetes/cmd/kube-controller-manager/app"
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/capabilities"
 	kinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
 	"k8s.io/kubernetes/pkg/master"
+	"k8s.io/kubernetes/pkg/volume"
 	kutilerrors "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/errors"
 
 	assetapiserver "github.com/openshift/origin/pkg/assets/apiserver"
@@ -46,7 +48,6 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/etcd"
 	"github.com/openshift/origin/pkg/cmd/server/etcd/etcdserver"
 	kubernetes "github.com/openshift/origin/pkg/cmd/server/kubernetes/master"
-	kubecontrollers "github.com/openshift/origin/pkg/cmd/server/kubernetes/master/controller"
 	"github.com/openshift/origin/pkg/cmd/server/origin"
 	origincontrollers "github.com/openshift/origin/pkg/cmd/server/origin/controller"
 	originrest "github.com/openshift/origin/pkg/cmd/server/origin/rest"
@@ -406,11 +407,13 @@ func (m *Master) Start() error {
 			return err
 		}
 
-		// you can't double run healthz, so only do this next bit if we aren't starting the API
+		imageTemplate := variable.NewDefaultImageTemplate()
+		imageTemplate.Format = m.config.ImageConfig.Format
+		imageTemplate.Latest = m.config.ImageConfig.Latest
+		volume.NewPersistentVolumeRecyclerPodTemplate = newPersistentVolumeRecyclerPodTemplate(imageTemplate.ExpandOrDie("recycler"))
+
 		if !m.api {
-			imageTemplate := variable.NewDefaultImageTemplate()
-			imageTemplate.Format = m.config.ImageConfig.Format
-			imageTemplate.Latest = m.config.ImageConfig.Latest
+			// you can't double run healthz, so only do this next bit if we aren't starting the API
 
 			glog.Infof("Starting controllers on %s (%s)", m.config.ServingInfo.BindAddress, version.Get().String())
 			if len(m.config.DisabledFeatures) > 0 {
@@ -655,10 +658,6 @@ func startControllers(options configapi.MasterConfig, allocationController origi
 	if err != nil {
 		return err
 	}
-	kubeControllerConfig, err := kubecontrollers.BuildKubeControllerConfig(options)
-	if err != nil {
-		return err
-	}
 
 	// We need to start the serviceaccount-tokens controller first as it provides token
 	// generation for other controllers.
@@ -703,10 +702,8 @@ func startControllers(options configapi.MasterConfig, allocationController origi
 
 	allocationController.RunSecurityAllocationController()
 
-	kubernetesControllerInitializers, err := kubeControllerConfig.GetControllerInitializers()
-	if err != nil {
-		return err
-	}
+	// set the upstream default until it is configurable
+	kubernetesControllerInitializers := kubecontroller.NewControllerInitializers()
 	openshiftControllerInitializers, err := openshiftControllerConfig.GetControllerInitializers()
 	if err != nil {
 		return err
@@ -757,6 +754,8 @@ func getExcludedControllers(options configapi.MasterConfig) sets.String {
 		"ttl",
 		"bootstrapsigner",
 		"tokencleaner",
+		// remove the HPA controller until it is generic
+		"horizontalpodautoscaling",
 	)
 	if !configapi.IsBuildEnabled(&options) {
 		excludedControllers.Insert("openshift.io/build")