Merge pull request #634 from mhrivnak/move-startup-code

moves controller creation and startup out of ansible's main.go

Author: Shawn Hurley

commands/operator-sdk/cmd/up/local.go

@@ -132,14 +132,17 @@ func upLocalAnsible() {
 	done := make(chan error)
 
 	// start the proxy
-	proxy.RunProxy(done, proxy.Options{
+	err = proxy.Run(done, proxy.Options{
 		Address:    "localhost",
 		Port:       8888,
 		KubeConfig: mgr.GetConfig(),
 	})
+	if err != nil {
+		logrus.Fatalf("error starting proxy: %v", err)
+	}
 
 	// start the operator
-	go ansibleOperator.Run(done, mgr)
+	go ansibleOperator.Run(done, mgr, "./watches.yaml")
 
 	// wait for either to finish
 	err = <-done

pkg/ansible/operator/operator.go

@@ -15,7 +15,6 @@
 package operator
 
 import (
-	"log"
 	"math/rand"
 	"time"
 
@@ -30,8 +29,8 @@ import (
 // Run - A blocking function which starts a controller-runtime manager
 // It starts an Operator by reading in the values in `./watches.yaml`, adds a controller
 // to the manager, and finally running the manager.
-func Run(done chan error, mgr manager.Manager) {
-	watches, err := runner.NewFromWatches("./watches.yaml")
+func Run(done chan error, mgr manager.Manager, watchesPath string) {
+	watches, err := runner.NewFromWatches(watchesPath)
 	if err != nil {
 		logrus.Error("Failed to get watches")
 		done <- err
@@ -46,6 +45,5 @@ func Run(done chan error, mgr manager.Manager) {
 			Runner: runner,
 		})
 	}
-	log.Fatal(mgr.Start(c))
-	done <- nil
+	done <- mgr.Start(c)
 }

pkg/ansible/proxy/proxy.go

@@ -108,13 +108,13 @@ type Options struct {
 	KubeConfig       *rest.Config
 }
 
-// RunProxy will start a proxy server in a go routine and return on the error
-// channel if something is not correct on startup.
-func RunProxy(done chan error, o Options) {
+// Run will start a proxy server in a go routine that returns on the error
+// channel if something is not correct on startup. Run will not return until
+// the network socket is listening.
+func Run(done chan error, o Options) error {
 	server, err := newServer("/", o.KubeConfig)
 	if err != nil {
-		done <- err
-		return
+		return err
 	}
 	if o.Handler != nil {
 		server.Handler = o.Handler(server.Handler)
@@ -125,11 +125,11 @@ func RunProxy(done chan error, o Options) {
 	}
 	l, err := server.Listen(o.Address, o.Port)
 	if err != nil {
-		done <- err
-		return
+		return err
 	}
 	go func() {
 		logrus.Infof("Starting to serve on %s\n", l.Addr().String())
 		done <- server.ServeOnListener(l)
 	}()
+	return nil
 }

test/ansible-operator/cmd/ansible-operator/main.go

@@ -17,19 +17,15 @@ package main
 import (
 	"flag"
 	"log"
-	"math/rand"
 	"runtime"
-	"time"
 
-	"github.com/operator-framework/operator-sdk/pkg/ansible/controller"
+	"github.com/operator-framework/operator-sdk/pkg/ansible/operator"
 	proxy "github.com/operator-framework/operator-sdk/pkg/ansible/proxy"
-	"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
 	"github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
-	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
 
 	"github.com/sirupsen/logrus"
 )
@@ -60,14 +56,17 @@ func main() {
 	done := make(chan error)
 
 	// start the proxy
-	proxy.RunProxy(done, proxy.Options{
+	err = proxy.Run(done, proxy.Options{
 		Address:    "localhost",
 		Port:       8888,
 		KubeConfig: mgr.GetConfig(),
 	})
+	if err != nil {
+		logrus.Fatalf("error starting proxy: %v", err)
+	}
 
 	// start the operator
-	go runSDK(done, mgr)
+	go operator.Run(done, mgr, "/opt/ansible/watches.yaml")
 
 	// wait for either to finish
 	err = <-done
@@ -77,23 +76,3 @@ func main() {
 		logrus.Fatal(err.Error())
 	}
 }
-
-func runSDK(done chan error, mgr manager.Manager) {
-	watches, err := runner.NewFromWatches("/opt/ansible/watches.yaml")
-	if err != nil {
-		logrus.Error("Failed to get watches")
-		done <- err
-		return
-	}
-	rand.Seed(time.Now().Unix())
-	c := signals.SetupSignalHandler()
-
-	for gvk, runner := range watches {
-		controller.Add(mgr, controller.Options{
-			GVK:    gvk,
-			Runner: runner,
-		})
-	}
-	log.Fatal(mgr.Start(c))
-	done <- nil
-}