[feature] add system area

Signed-off-by: Stepan Paksashvili <stepan.paksashvili@flant.com>

Author: ipaqsa

pkg/app/app.go

@@ -53,7 +53,7 @@ var (
 	CRDsFilters = "doc-,_"
 
 	// NumberOfParallelQueues defines the number of precreated parallel queues for parallel execution
-	NumberOfParallelQueues   = 10
+	NumberOfParallelQueues   = 15
 	ParallelQueuePrefix      = "parallel_queue"
 	ParallelQueueNamePattern = ParallelQueuePrefix + "_%d"
 )

pkg/module_manager/loader/fs/fs.go

@@ -71,6 +71,8 @@ func (fl *FileSystemLoader) getBasicModule(definition moduleDefinition, commonSt
 		return nil, fmt.Errorf("new basic module: %w", err)
 	}
 
+	m.SetCritical(true)
+
 	return m, nil
 }
 

pkg/module_manager/models/modules/basic.go

@@ -54,6 +54,8 @@ type BasicModule struct {
 	// required
 	Path string
 
+	critical bool
+
 	crdsExist     bool
 	crdFilesPaths []string
 
@@ -114,6 +116,10 @@ func (bm *BasicModule) WithLogger(logger *log.Logger) {
 	bm.logger = logger
 }
 
+func (bm *BasicModule) SetCritical(value bool) {
+	bm.critical = value
+}
+
 // getCRDsFromPath scan path/crds directory and store yaml file in slice
 // if file name do not start with `_` or `doc-` prefix
 func getCRDsFromPath(path string, crdsFilters string) []string {
@@ -183,6 +189,10 @@ func (bm *BasicModule) GetHooks(bt ...sh_op_types.BindingType) []*hooks.ModuleHo
 	return bm.hooks.getHooks(bt...)
 }
 
+func (bm *BasicModule) GetCritical() bool {
+	return bm.critical
+}
+
 // HasReadiness returns whether the module has a readiness probe configured.
 func (bm *BasicModule) HasReadiness() bool {
 	return bm.hasReadiness

pkg/module_manager/module_manager.go

@@ -30,6 +30,7 @@ import (
 	"github.com/flant/addon-operator/pkg/module_manager/models/moduleset"
 	"github.com/flant/addon-operator/pkg/module_manager/scheduler"
 	"github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders"
+	bootstrapped_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/bootstrapped"
 	dynamic_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/dynamically_enabled"
 	kube_config_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/kube_config"
 	script_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/script_enabled"
@@ -56,6 +57,8 @@ const (
 	moduleMaintenanceMetricName  = "{PREFIX}mm_module_maintenance"
 
 	moduleManagerServiceName = "module-manager"
+
+	bootstrappedValueSection = "clusterIsBootstrapped"
 )
 
 // ModulesState determines which modules should be enabled, disabled or reloaded.
@@ -377,12 +380,30 @@ func (mm *ModuleManager) Init(logger *log.Logger) error {
 		return fmt.Errorf("couldn't add scrpt_enabled extender: %w", err)
 	}
 
-	// by this point we must have all required scheduler extenders attached
+	bootstrappedExtender := bootstrapped_extender.NewExtender(func() (bool, error) {
+		value, ok := mm.global.GetValues(false)[bootstrappedValueSection]
+		if !ok {
+			return false, nil
+		}
+
+		bootstrapped, ok := value.(bool)
+		if !ok {
+			return false, errors.New("bootstrapped value not boolean")
+		}
+
+		return bootstrapped, nil
+	})
+
+	if err = mm.moduleScheduler.AddExtender(bootstrappedExtender); err != nil {
+		return fmt.Errorf("couldn't add bootstrapped extender: %w", err)
+	}
+
+	// by this point, we must have all required scheduler extenders attached
 	if err := mm.moduleScheduler.ApplyExtenders(app.AppliedExtenders); err != nil {
 		return fmt.Errorf("couldn't apply extenders to the module scheduler: %w", err)
 	}
 
-	return mm.registerModules(scriptEnabledExtender)
+	return mm.registerModules(scriptEnabledExtender, bootstrappedExtender)
 }
 
 func (mm *ModuleManager) GetKubeConfigValid() bool {
@@ -1392,7 +1413,7 @@ func queueHasPendingModuleDeleteTask(q *queue.TaskQueue, moduleName string) bool
 } */
 
 // registerModules load all available modules from modules directory.
-func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.Extender) error {
+func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.Extender, bootstrappedExtender *bootstrapped_extender.Extender) error {
 	if mm.ModulesDir == "" {
 		mm.logger.Warn("empty modules directory is passed, no modules to load")
 
@@ -1434,10 +1455,15 @@ func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.
 		mod.WithDependencies(dep)
 		set.Add(mod)
 
-		if err := mm.moduleScheduler.AddModuleVertex(mod); err != nil {
+		if err = mm.moduleScheduler.AddModuleVertex(mod); err != nil {
 			return fmt.Errorf("add module vertex: %w", err)
 		}
 
+		// functional modules require bootstrapped cluster
+		if !mod.GetCritical() {
+			bootstrappedExtender.AddFunctionalModule(mod.GetName())
+		}
+
 		scriptEnabledExtender.AddBasicModule(mod)
 
 		mm.SendModuleEvent(events.ModuleEvent{
@@ -1446,8 +1472,11 @@ func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.
 		})
 	}
 
-	mm.logger.Debug("Found modules",
-		slog.Any("modules", set.NamesInOrder()))
+	if err = mm.moduleScheduler.Initialize(); err != nil {
+		return fmt.Errorf("initialize scheduler: %w", err)
+	}
+
+	mm.logger.Debug("Found modules", slog.Any("modules", set.NamesInOrder()))
 
 	mm.l.Lock()
 	mm.modules = set

pkg/module_manager/scheduler/extenders/bootstrapped/extender.go

@@ -0,0 +1,52 @@
+package bootstrapped
+
+import (
+	"k8s.io/utils/ptr"
+
+	"github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders"
+	exterr "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/error"
+)
+
+const (
+	Name extenders.ExtenderName = "Bootstrapped"
+)
+
+type Extender struct {
+	// check if the cluster bootstrapped
+	isBootstrapped func() (bool, error)
+	// functional modules require bootstrapped cluster
+	modules map[string]struct{}
+}
+
+func NewExtender(helper func() (bool, error)) *Extender {
+	return &Extender{
+		modules:        make(map[string]struct{}),
+		isBootstrapped: helper,
+	}
+}
+
+func (e *Extender) Name() extenders.ExtenderName {
+	return Name
+}
+
+func (e *Extender) Filter(moduleName string, _ map[string]string) (*bool, error) {
+	if _, ok := e.modules[moduleName]; ok {
+		bootstrapped, err := e.isBootstrapped()
+		if err != nil {
+			return nil, exterr.Permanent(err)
+		}
+
+		// enable functional modules only if the cluster bootstrapped
+		return ptr.To(bootstrapped), nil
+	}
+
+	return nil, nil
+}
+
+func (e *Extender) IsTerminator() bool {
+	return true
+}
+
+func (e *Extender) AddFunctionalModule(moduleName string) {
+	e.modules[moduleName] = struct{}{}
+}

pkg/module_manager/scheduler/extenders/mock/extenders_mock.go

@@ -127,28 +127,8 @@ func (f *TopologicalOne) GetTopologicalHints(moduleName string) []string {
 		return []string{"foo", "bar"}
 	case "operator-trivy":
 		return []string{"istio", "admission-policy-engine"}
-	}
-
-	return nil
-}
-
-type TopologicalTwo struct{}
-
-func (f *TopologicalTwo) Name() extenders.ExtenderName {
-	return extenders.ExtenderName("TopologicalTwo")
-}
-
-func (f *TopologicalTwo) Filter(_ string, _ map[string]string) (*bool, error) {
-	return nil, nil
-}
-
-func (f *TopologicalTwo) IsTerminator() bool {
-	return true
-}
-
-func (f *TopologicalTwo) GetTopologicalHints(moduleName string) []string {
-	if moduleName == "my-module" {
-		return []string{"unknown-module"}
+	case "cilium-hubble":
+		return []string{"cni-cilium"}
 	}
 
 	return nil

pkg/module_manager/scheduler/node/mock/node_mock.go

@@ -6,6 +6,7 @@ import (
 )
 
 type MockModule struct {
+	Critical              bool
 	EnabledScriptResult   bool
 	EnabledScriptErr      error
 	EnabledModules        *[]string
@@ -27,6 +28,10 @@ func (m MockModule) GetOrder() uint32 {
 	return m.Order
 }
 
+func (m MockModule) GetCritical() bool {
+	return m.Critical
+}
+
 func (m MockModule) RunEnabledScript(_ context.Context, _ string, _ []string, _ map[string]string) (bool, error) {
 	if m.EnabledScriptErr != nil {
 		return false, m.EnabledScriptErr

pkg/module_manager/scheduler/node/node.go

@@ -10,6 +10,7 @@ type ModuleInterface interface {
 	GetName() string
 	GetOrder() uint32
 	GetPath() string
+	GetCritical() bool
 }
 
 type NodeType string