Allow to enable/disable machine healtch-check controller

Gopkg.toml

@@ -41,7 +41,8 @@ required = [
 
 [[override]]
   name = "k8s.io/kube-aggregator"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.4"
+  source = "github.com/openshift/kubernetes-kube-aggregator"
 
 [[override]]
   name = "github.com/openshift/cluster-api"
@@ -53,31 +54,34 @@ required = [
 
 [[override]]
   name = "github.com/openshift/api"
-  branch = "master"
+  branch = "rebase-1.13.4"
 
 [[override]]
   name = "github.com/openshift/client-go"
-  branch = "master"
+  branch = "rebase-1.13.4"
 
 [[override]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.4"
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.4"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.4"
+  source = "github.com/openshift/kubernetes-apiextensions-apiserver"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.4"
+  source = "github.com/openshift/kubernetes-apimachinery"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.1"
+  version = "kubernetes-1.13.4"
+  source = "github.com/openshift/kubernetes-client-go"
 
 [[override]]
   name = "sigs.k8s.io/controller-runtime"

cmd/machine-api-operator/controller_context.go

@@ -3,6 +3,8 @@ package main
 import (
 	"time"
 
+	configinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
+
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/informers"
 )
@@ -12,6 +14,7 @@ type ControllerContext struct {
 	ClientBuilder *ClientBuilder
 
 	KubeNamespacedInformerFactory informers.SharedInformerFactory
+	ConfigInformerFactory         configinformersv1.SharedInformerFactory
 
 	AvailableResources map[schema.GroupVersionResource]bool
 
@@ -25,12 +28,15 @@ type ControllerContext struct {
 // CreateControllerContext creates the ControllerContext with the ClientBuilder.
 func CreateControllerContext(cb *ClientBuilder, stop <-chan struct{}, targetNamespace string) *ControllerContext {
 	kubeClient := cb.KubeClientOrDie("kube-shared-informer")
+	configClient := cb.OpenshiftClientOrDie("config-shared-informer")
 
-	kubeNamespacedSharedInformer := informers.NewFilteredSharedInformerFactory(kubeClient, resyncPeriod()(), targetNamespace, nil)
+	kubeNamespacedSharedInformer := informers.NewSharedInformerFactoryWithOptions(kubeClient, resyncPeriod()(), informers.WithNamespace(targetNamespace))
+	configSharedInformer := configinformersv1.NewSharedInformerFactoryWithOptions(configClient, resyncPeriod()())
 
 	return &ControllerContext{
 		ClientBuilder:                 cb,
 		KubeNamespacedInformerFactory: kubeNamespacedSharedInformer,
+		ConfigInformerFactory:         configSharedInformer,
 		Stop:             stop,
 		InformersStarted: make(chan struct{}),
 		ResyncPeriod:     resyncPeriod(),

cmd/machine-api-operator/start.go

@@ -81,6 +81,7 @@ func startControllers(ctx *ControllerContext) error {
 
 		config,
 		ctx.KubeNamespacedInformerFactory.Apps().V1().Deployments(),
+		ctx.ConfigInformerFactory.Config().V1().FeatureGates(),
 
 		ctx.ClientBuilder.KubeClientOrDie(componentName),
 		ctx.ClientBuilder.OpenshiftClientOrDie(componentName),

owned-manifests/machine-api-controllers.yaml

@@ -71,6 +71,7 @@ spec:
           requests:
             cpu: 10m
             memory: 20Mi
+      {{if .Controllers.MachineHealthCheckEnabled }}
       - name: machine-healthcheck-controller
         image: {{ .Controllers.MachineHealthCheck }}
         command:
@@ -82,3 +83,4 @@ spec:
           requests:
             cpu: 10m
             memory: 20Mi
+      {{end}}