Skip to content

Commit 02cf552

Browse files
authored
[chore] remove bootstrapped extender (#637)
Signed-off-by: Stepan Paksashvili <stepan.paksashvili@flant.com>
1 parent 27c44ca commit 02cf552

File tree

3 files changed

+2
-82
lines changed

3 files changed

+2
-82
lines changed

pkg/module_manager/module_manager.go

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"github.com/flant/addon-operator/pkg/module_manager/models/moduleset"
3131
"github.com/flant/addon-operator/pkg/module_manager/scheduler"
3232
"github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders"
33-
bootstrapped_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/bootstrapped"
3433
dynamic_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/dynamically_enabled"
3534
kube_config_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/kube_config"
3635
script_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/script_enabled"
@@ -57,8 +56,6 @@ const (
5756
moduleMaintenanceMetricName = "{PREFIX}mm_module_maintenance"
5857

5958
moduleManagerServiceName = "module-manager"
60-
61-
bootstrappedValueSection = "clusterIsBootstrapped"
6259
)
6360

6461
// ModulesState determines which modules should be enabled, disabled or reloaded.
@@ -380,30 +377,12 @@ func (mm *ModuleManager) Init(logger *log.Logger) error {
380377
return fmt.Errorf("couldn't add scrpt_enabled extender: %w", err)
381378
}
382379

383-
bootstrappedExtender := bootstrapped_extender.NewExtender(func() (bool, error) {
384-
value, ok := mm.global.GetValues(false)[bootstrappedValueSection]
385-
if !ok {
386-
return false, nil
387-
}
388-
389-
bootstrapped, ok := value.(bool)
390-
if !ok {
391-
return false, errors.New("bootstrapped value not boolean")
392-
}
393-
394-
return bootstrapped, nil
395-
})
396-
397-
if err = mm.moduleScheduler.AddExtender(bootstrappedExtender); err != nil {
398-
return fmt.Errorf("couldn't add bootstrapped extender: %w", err)
399-
}
400-
401380
// by this point, we must have all required scheduler extenders attached
402381
if err := mm.moduleScheduler.ApplyExtenders(app.AppliedExtenders); err != nil {
403382
return fmt.Errorf("couldn't apply extenders to the module scheduler: %w", err)
404383
}
405384

406-
return mm.registerModules(scriptEnabledExtender, bootstrappedExtender)
385+
return mm.registerModules(scriptEnabledExtender)
407386
}
408387

409388
func (mm *ModuleManager) GetKubeConfigValid() bool {
@@ -1426,7 +1405,7 @@ func queueHasPendingModuleDeleteTask(q *queue.TaskQueue, moduleName string) bool
14261405
} */
14271406

14281407
// registerModules load all available modules from modules directory.
1429-
func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.Extender, bootstrappedExtender *bootstrapped_extender.Extender) error {
1408+
func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.Extender) error {
14301409
if mm.ModulesDir == "" {
14311410
mm.logger.Warn("empty modules directory is passed, no modules to load")
14321411

@@ -1472,11 +1451,6 @@ func (mm *ModuleManager) registerModules(scriptEnabledExtender *script_extender.
14721451
return fmt.Errorf("add module vertex: %w", err)
14731452
}
14741453

1475-
// functional modules require bootstrapped cluster
1476-
if !mod.GetCritical() {
1477-
bootstrappedExtender.AddFunctionalModule(mod.GetName())
1478-
}
1479-
14801454
scriptEnabledExtender.AddBasicModule(mod)
14811455

14821456
mm.SendModuleEvent(events.ModuleEvent{

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

pkg/module_manager/scheduler/scheduler.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/hashicorp/go-multierror"
2020

2121
"github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders"
22-
bootstrapped_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/bootstrapped"
2322
dynamic_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/dynamically_enabled"
2423
exerror "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/error"
2524
kube_config_extender "github.com/flant/addon-operator/pkg/module_manager/scheduler/extenders/kube_config"
@@ -41,7 +40,6 @@ var defaultAppliedExtenders = []extenders.ExtenderName{
4140
dynamic_extender.Name,
4241
kube_config_extender.Name,
4342
script_extender.Name,
44-
bootstrapped_extender.Name,
4543
}
4644

4745
type extenderContainer struct {

0 commit comments

Comments
 (0)