refactor(main): use signal context and new operator contructors

Author: njhale

cmd/catalog/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net/http"
@@ -14,6 +15,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
+	utilclock "k8s.io/apimachinery/pkg/util/clock"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog"
@@ -66,7 +68,9 @@ func init() {
 }
 
 func main() {
-	stopCh := signals.SetupSignalHandler()
+	// Get exit signal context
+	ctx, cancel := context.WithCancel(signals.Context())
+	defer cancel()
 
 	// Parse the command-line flags.
 	flag.Parse()
@@ -91,7 +95,8 @@ func main() {
 
 	logger := log.New()
 	if *debug {
-		logger.SetLevel(log.DebugLevel)
+		// TODO: change back to debug level
+		logger.SetLevel(log.TraceLevel)
 	}
 	logger.Infof("log level %s", logger.Level)
 
@@ -142,17 +147,17 @@ func main() {
 	opClient := operatorclient.NewClientFromConfig(*kubeConfigPath, logger)
 
 	// Create a new instance of the operator.
-	catalogOperator, err := catalog.NewOperator(*kubeConfigPath, logger, *wakeupInterval, *configmapServerImage, *catalogNamespace, namespaces...)
+	op, err := catalog.NewOperator(ctx, *kubeConfigPath, utilclock.RealClock{}, logger, *wakeupInterval, *configmapServerImage, *catalogNamespace, namespaces...)
 	if err != nil {
 		log.Panicf("error configuring operator: %s", err.Error())
 	}
 
-	ready, done, sync := catalogOperator.Run(stopCh)
-	<-ready
+	op.Run(ctx)
+	<-op.Ready()
 
 	if *writeStatusName != "" {
-		operatorstatus.MonitorClusterStatus(*writeStatusName, sync, stopCh, opClient, configClient)
+		operatorstatus.MonitorClusterStatus(*writeStatusName, op.AtLevel(), op.Done(), opClient, configClient)
 	}
 
-	<-done
+	<-op.Done()
 }

cmd/olm/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net/http"
@@ -16,7 +17,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client"
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/signals"
@@ -63,7 +63,9 @@ func init() {
 
 // main function - entrypoint to OLM operator
 func main() {
-	stopCh := signals.SetupSignalHandler()
+	// Get exit signal context
+	ctx, cancel := context.WithCancel(signals.Context())
+	defer cancel()
 
 	// Parse the command-line flags.
 	flag.Parse()
@@ -86,39 +88,14 @@ func main() {
 		}
 	}
 
-	// Create a client for OLM
-	crClient, err := client.NewClient(*kubeConfigPath)
-	if err != nil {
-		log.Fatalf("error configuring client: %s", err.Error())
-	}
-
-	logger := log.New()
-
 	// Set log level to debug if `debug` flag set
+	logger := log.New()
 	if *debug {
-		logger.SetLevel(log.DebugLevel)
+		// TODO: Switch back to debug level
+		logger.SetLevel(log.TraceLevel)
 	}
 	logger.Infof("log level %s", logger.Level)
 
-	opClient := operatorclient.NewClientFromConfig(*kubeConfigPath, logger)
-
-	// create a config client for operator status
-	config, err := clientcmd.BuildConfigFromFlags("", *kubeConfigPath)
-	if err != nil {
-		log.Fatalf("error configuring client: %s", err.Error())
-	}
-	configClient, err := configv1client.NewForConfig(config)
-	if err != nil {
-		log.Fatalf("error configuring client: %s", err.Error())
-	}
-
-	// Create a new instance of the operator.
-	operator, err := olm.NewOperator(logger, crClient, opClient, &install.StrategyResolver{}, *wakeupInterval, namespaces)
-
-	if err != nil {
-		log.Fatalf("error configuring operator: %s", err.Error())
-	}
-
 	var useTLS bool
 	if *tlsCertPath != "" && *tlsKeyPath == "" || *tlsCertPath == "" && *tlsKeyPath != "" {
 		logger.Warn("both --tls-key and --tls-crt must be provided for TLS to be enabled, falling back to non-https")
@@ -159,12 +136,40 @@ func main() {
 		}()
 	}
 
-	ready, done, sync := operator.Run(stopCh)
-	<-ready
+	// create a config client for operator status
+	config, err := clientcmd.BuildConfigFromFlags("", *kubeConfigPath)
+	if err != nil {
+		log.Fatalf("error configuring client: %s", err.Error())
+	}
+	configClient, err := configv1client.NewForConfig(config)
+	if err != nil {
+		log.Fatalf("error configuring client: %s", err.Error())
+	}
+	opClient := operatorclient.NewClientFromConfig(*kubeConfigPath, logger)
+	crClient, err := client.NewClient(*kubeConfigPath)
+	if err != nil {
+		log.Fatalf("error configuring client: %s", err.Error())
+	}
+
+	// Create a new instance of the operator.
+	op, err := olm.NewOperator(
+		ctx,
+		olm.WithLogger(logger),
+		olm.WithWatchedNamespaces(namespaces...),
+		olm.WithResyncPeriod(*wakeupInterval),
+		olm.WithExternalClient(crClient),
+		olm.WithOperatorClient(opClient),
+	)
+	if err != nil {
+		log.Fatalf("error configuring operator: %s", err.Error())
+	}
+
+	op.Run(ctx)
+	<-op.Ready()
 
 	if *writeStatusName != "" {
-		operatorstatus.MonitorClusterStatus(*writeStatusName, sync, stopCh, opClient, configClient)
+		operatorstatus.MonitorClusterStatus(*writeStatusName, op.AtLevel(), ctx.Done(), opClient, configClient)
 	}
 
-	<-done
+	<-op.Done()
 }

cmd/package-server/main.go

@@ -7,10 +7,10 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	k8sserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/util/logs"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/signals"
 )
 
 const (
@@ -19,13 +19,13 @@ const (
 
 // config flags defined globally so that they appear on the test binary as well
 var (
-	stopCh  = k8sserver.SetupSignalHandler()
+	ctx  = signals.Context()
 	options = server.NewPackageServerOptions(os.Stdout, os.Stderr)
 	cmd     = &cobra.Command{
 		Short: "Launch a package-server",
 		Long:  "Launch a package-server",
 		RunE: func(c *cobra.Command, args []string) error {
-			if err := options.Run(stopCh); err != nil {
+			if err := options.Run(ctx); err != nil {
 				return err
 			}
 			return nil