Addon-operator method calls (#381)

Author: yalosev

cmd/addon-operator/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"os"
@@ -44,12 +45,11 @@ func main() {
 			// Init rand generator.
 			rand.Seed(time.Now().UnixNano())
 
-			operator := addon_operator.NewAddonOperator()
-			err := addon_operator.Bootstrap(operator)
+			operator := addon_operator.NewAddonOperator(context.Background())
+			err := operator.Start()
 			if err != nil {
 				os.Exit(1)
 			}
-			operator.Start()
 
 			// Block action by waiting signals from OS.
 			utils_signal.WaitForProcessInterruption(func() {

pkg/addon-operator/bootstrap.go

@@ -1,7 +1,6 @@
 package addon_operator
 
 import (
-	"context"
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
@@ -17,7 +16,7 @@ import (
 )
 
 // Bootstrap inits all dependencies for a full-fledged AddonOperator instance.
-func Bootstrap(op *AddonOperator) error {
+func (op *AddonOperator) bootstrap() error {
 	runtimeConfig := config.NewConfig()
 	// Init logging subsystem.
 	sh_app.SetupLogging(runtimeConfig)
@@ -40,8 +39,6 @@ func Bootstrap(op *AddonOperator) error {
 
 	log.Infof("Addon-operator namespace: %s", app.Namespace)
 
-	op.WithContext(context.Background())
-
 	// Debug server.
 	debugServer, err := shell_operator.InitDefaultDebugServer()
 	if err != nil {
@@ -55,7 +52,7 @@ func Bootstrap(op *AddonOperator) error {
 		return err
 	}
 
-	err = AssembleAddonOperator(op, app.ModulesDir, globalHooksDir, tempDir, debugServer, runtimeConfig)
+	err = op.Assemble(app.ModulesDir, globalHooksDir, tempDir, debugServer, runtimeConfig)
 	if err != nil {
 		log.Errorf("Fatal: %s", err)
 		return err
@@ -64,17 +61,17 @@ func Bootstrap(op *AddonOperator) error {
 	return nil
 }
 
-func AssembleAddonOperator(op *AddonOperator, modulesDir string, globalHooksDir string, tempDir string, debugServer *debug.Server, runtimeConfig *config.Config) (err error) {
-	RegisterDefaultRoutes(op)
+func (op *AddonOperator) Assemble(modulesDir string, globalHooksDir string, tempDir string, debugServer *debug.Server, runtimeConfig *config.Config) (err error) {
+	op.RegisterDefaultRoutes()
 	RegisterAddonOperatorMetrics(op.MetricStorage)
 	StartLiveTicksUpdater(op.MetricStorage)
 	StartTasksQueueLengthUpdater(op.MetricStorage, op.TaskQueues)
 
 	// Register routes in debug server.
 	shell_operator.RegisterDebugQueueRoutes(debugServer, op.ShellOperator)
 	shell_operator.RegisterDebugConfigRoutes(debugServer, runtimeConfig)
-	RegisterDebugGlobalRoutes(debugServer, op)
-	RegisterDebugModuleRoutes(debugServer, op)
+	op.RegisterDebugGlobalRoutes(debugServer)
+	op.RegisterDebugModuleRoutes(debugServer)
 
 	// Helm client factory.
 	op.Helm, err = helm.InitHelmClientFactory(op.KubeClient)
@@ -89,7 +86,7 @@ func AssembleAddonOperator(op *AddonOperator, modulesDir string, globalHooksDir
 		return fmt.Errorf("initialize Helm resources manager: %s", err)
 	}
 
-	SetupModuleManager(op, modulesDir, globalHooksDir, tempDir, runtimeConfig)
+	op.SetupModuleManager(modulesDir, globalHooksDir, tempDir, runtimeConfig)
 
 	err = op.InitModuleManager()
 	if err != nil {
@@ -99,7 +96,7 @@ func AssembleAddonOperator(op *AddonOperator, modulesDir string, globalHooksDir
 	return nil
 }
 
-func SetupModuleManager(op *AddonOperator, modulesDir string, globalHooksDir string, tempDir string, runtimeConfig *config.Config) {
+func (op *AddonOperator) SetupModuleManager(modulesDir string, globalHooksDir string, tempDir string, runtimeConfig *config.Config) {
 	// Create manager to check values in ConfigMap.
 	kcfg := kube_config_manager.Config{
 		Namespace:     app.Namespace,

pkg/addon-operator/debug_server.go

@@ -13,7 +13,7 @@ import (
 	"github.com/flant/shell-operator/pkg/hook/types"
 )
 
-func RegisterDebugGlobalRoutes(dbgSrv *debug.Server, op *AddonOperator) {
+func (op *AddonOperator) RegisterDebugGlobalRoutes(dbgSrv *debug.Server) {
 	dbgSrv.Route("/global/list.{format:(json|yaml)}", func(_ *http.Request) (interface{}, error) {
 		return map[string]interface{}{
 			"globalHooks": op.ModuleManager.GetGlobalHooksNames(),
@@ -44,7 +44,7 @@ func RegisterDebugGlobalRoutes(dbgSrv *debug.Server, op *AddonOperator) {
 	})
 }
 
-func RegisterDebugModuleRoutes(dbgSrv *debug.Server, op *AddonOperator) {
+func (op *AddonOperator) RegisterDebugModuleRoutes(dbgSrv *debug.Server) {
 	dbgSrv.Route("/module/list.{format:(json|yaml|text)}", func(_ *http.Request) (interface{}, error) {
 		return map[string][]string{"enabledModules": op.ModuleManager.GetEnabledModuleNames()}, nil
 	})

pkg/addon-operator/http_server.go

@@ -8,7 +8,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-func RegisterDefaultRoutes(op *AddonOperator) {
+func (op *AddonOperator) RegisterDefaultRoutes() {
 	http.HandleFunc("/", func(writer http.ResponseWriter, request *http.Request) {
 		_, _ = writer.Write([]byte(`<html>
     <head><title>Addon-operator</title></head>

pkg/addon-operator/operator.go

@@ -55,19 +55,19 @@ type AddonOperator struct {
 	InitialKubeConfig *kube_config_manager.KubeConfig
 }
 
-func NewAddonOperator() *AddonOperator {
+func NewAddonOperator(ctx context.Context) *AddonOperator {
+	cctx, cancel := context.WithCancel(ctx)
+	so := shell_operator.NewShellOperator()
+	so.WithContext(cctx)
+
 	return &AddonOperator{
-		ShellOperator: &shell_operator.ShellOperator{},
+		ctx:           cctx,
+		cancel:        cancel,
+		ShellOperator: so,
 		ConvergeState: NewConvergeState(),
 	}
 }
 
-func (op *AddonOperator) WithContext(ctx context.Context) *AddonOperator {
-	op.ctx, op.cancel = context.WithCancel(ctx)
-	op.ShellOperator.WithContext(op.ctx)
-	return op
-}
-
 func (op *AddonOperator) Stop() {
 	if op.cancel != nil {
 		op.cancel()
@@ -280,7 +280,11 @@ func (op *AddonOperator) RegisterManagerEventsHandlers() {
 }
 
 // Start runs all managers, event and queue handlers.
-func (op *AddonOperator) Start() {
+func (op *AddonOperator) Start() error {
+	if err := op.bootstrap(); err != nil {
+		return err
+	}
+
 	log.Info("Start first converge for modules")
 	// Loading the onStartup hooks into the queue and running all modules.
 	// Turning tracking changes on only after startup ends.
@@ -303,6 +307,8 @@ func (op *AddonOperator) Start() {
 	op.KubeConfigManager.Start()
 	op.ModuleManager.Start()
 	op.StartModuleManagerEventHandler()
+
+	return nil
 }
 
 // BootstrapMainQueue adds tasks to initiate Startup sequence:

pkg/addon-operator/operator_test.go

@@ -102,8 +102,7 @@ func assembleTestAddonOperator(t *testing.T, configPath string) (*AddonOperator,
 	g.Expect(err).ShouldNot(HaveOccurred(), "Should create ConfigMap/%s", result.cmName)
 
 	// Assemble AddonOperator.
-	op := NewAddonOperator()
-	op.WithContext(context.Background())
+	op := NewAddonOperator(context.Background())
 	op.KubeClient = kubeClient
 	// Mock helm client for ModuleManager
 	result.helmClient = &mockhelm.Client{}