Refactor OCPControllerManager to conform to the internal service manager

pkg/cmd/run.go

@@ -74,7 +74,7 @@ func RunMicroshift(cfg *config.MicroshiftConfig, flags *pflag.FlagSet) error {
 		util.Must(m.AddService(controllers.NewKubeControllerManager(cfg)))
 		// util.Must(m.AddService(controllers.NewOpenShiftPrepJob()))
 		// util.Must(m.AddService(controllers.NewOpenShiftAPIServer()))
-		// util.Must(m.AddService(controllers.NewOpenShiftControllerManager()))
+		util.Must(m.AddService(controllers.NewOpenShiftControllerManager(cfg)))
 		// util.Must(m.AddService(controllers.NewOpenShiftAPIComponents()))
 		// util.Must(m.AddService(controllers.NewInfrastructureServices()))
 
@@ -145,7 +145,7 @@ func startControllerOnly(cfg *config.MicroshiftConfig) error {
 	controllers.OCPAPIServer(cfg)
 
 	//TODO: cloud provider
-	controllers.OCPControllerManager(cfg)
+	// controllers.OCPControllerManager(cfg)
 
 	if err := controllers.StartOCPAPIComponents(cfg); err != nil {
 		return err

pkg/controllers/ocp-controllers.go

@@ -18,6 +18,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"os"
 	"strconv"
@@ -34,6 +35,7 @@ import (
 	openshift_controller_manager "github.com/openshift/openshift-controller-manager/pkg/cmd/openshift-controller-manager"
 
 	"github.com/openshift/microshift/pkg/config"
+	"github.com/openshift/microshift/pkg/util"
 )
 
 func newOpenshiftApiServerCommand(stopCh <-chan struct{}) *cobra.Command {
@@ -165,15 +167,74 @@ func newOpenShiftControllerManagerCommand() *cobra.Command {
 	return cmd
 }
 
-func OCPControllerManager(cfg *config.MicroshiftConfig) {
-	command := newOpenShiftControllerManagerCommand()
+type OCPControllerManager struct {
+	ConfigFilePath string
+	Output         io.Writer
+}
+
+const (
+	// OCPControllerManager component name
+	componentOCM = "ocp-controller-manager"
+)
+
+func NewOpenShiftControllerManager(cfg *config.MicroshiftConfig) *OCPControllerManager {
+	s := &OCPControllerManager{}
+	s.configure(cfg)
+	return s
+}
+
+func (s *OCPControllerManager) Name() string           { return componentOCM }
+func (s *OCPControllerManager) Dependencies() []string { return []string{"kube-apiserver"} }
+
+func (s *OCPControllerManager) configure(cfg *config.MicroshiftConfig) error {
+	var configFilePath = cfg.DataDir + "/resources/openshift-controller-manager/config/config.yaml"
+
+	if err := config.OpenShiftControllerManagerConfig(cfg); err != nil {
+		logrus.Infof("Failed to create a new ocp-controller-manager configuration: %v", err)
+		return err
+	}
 	args := []string{
-		"--config=" + cfg.DataDir + "/resources/openshift-controller-manager/config/config.yaml",
+		"--config=" + configFilePath,
+	}
+
+	options := openshift_controller_manager.OpenShiftControllerManager{Output: os.Stdout}
+	options.ConfigFilePath = configFilePath
+
+	cmd := &cobra.Command{
+		Use:          componentOCM,
+		Long:         componentOCM,
+		SilenceUsage: true,
+		RunE:         func(cmd *cobra.Command, args []string) error { return nil },
 	}
-	startArgs := append(args, "start")
-	command.SetArgs(startArgs)
 
+	flags := cmd.Flags()
+	cmd.SetArgs(args)
+	flags.StringVar(&options.ConfigFilePath, "config", options.ConfigFilePath, "Location of the master configuration file to run from.")
+	cmd.MarkFlagFilename("config", "yaml", "yml")
+	cmd.MarkFlagRequired("config")
+
+	s.ConfigFilePath = options.ConfigFilePath
+	s.Output = options.Output
+
+	return nil
+}
+
+func (s *OCPControllerManager) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
+	defer close(stopped)
+
+	// run readiness check
 	go func() {
-		logrus.Fatalf("ocp controller-manager exited: %v", command.Execute())
+		healthcheckStatus := util.RetryTCPConnection("127.0.0.1", "8445")
+		if !healthcheckStatus {
+			logrus.Fatalf("%s failed to start", s.Name())
+		}
+		logrus.Infof("%s is ready", s.Name())
+		close(ready)
 	}()
+	options := openshift_controller_manager.OpenShiftControllerManager{Output: os.Stdout}
+	options.ConfigFilePath = s.ConfigFilePath
+	if err := options.StartControllerManager(); err != nil {
+		logrus.Fatalf("Failed to start ocp-controller-manager %v", err)
+	}
+	return ctx.Err()
 }

pkg/util/net.go

@@ -17,6 +17,7 @@ package util
 
 import (
 	"crypto/tls"
+	tcpnet "net"
 	"net/http"
 	"time"
 
@@ -52,3 +53,21 @@ func RetryInsecureHttpsGet(url string) int {
 
 	return status
 }
+
+func RetryTCPConnection(host string, port string) bool {
+	status := false
+	err := wait.Poll(5*time.Second, 120*time.Second, func() (bool, error) {
+		timeout := 30 * time.Second
+		_, err := tcpnet.DialTimeout("tcp", tcpnet.JoinHostPort(host, port), timeout)
+
+		if err == nil {
+			status = true
+			return true, nil
+		}
+		return false, nil
+	})
+	if err != nil && err == wait.ErrWaitTimeout {
+		logrus.Warningf("Endpoint is not returning any status code")
+	}
+	return status
+}