[feature] separate function and critical modules

ipaqsa · ipaqsa · commit 8d74240d6f4d · 2025-07-04T18:57:38.000+03:00
Signed-off-by: Stepan Paksashvili &lt;stepan.paksashvili@flant.com&gt;
diff --git a/pkg/task/tasks/converge-modules/task.go b/pkg/task/tasks/converge-modules/task.go
@@ -365,6 +365,8 @@ func (s *Task) CreateConvergeModulesTasks(state *module_manager.ModulesState, lo
 				ModuleName:       moduleName,
 			})
 		modulesTasks = append(modulesTasks, newTask.WithQueuedAt(queuedAt))
+
+		s.functionalScheduler.Remove(moduleName)
 	}
 
 	// Add ModuleRun tasks to install or reload enabled modules.
@@ -381,6 +383,7 @@ func (s *Task) CreateConvergeModulesTasks(state *module_manager.ModulesState, lo
 		// skip functional modules
 		if !s.moduleManager.GetCritical(modules[0]) {
 			functionalModules = append(functionalModules, modules...)
+			continue
 		}
 
 		newLogLabels := utils.MergeLabels(logLabels)

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,8 @@ func (s Task) CreateConvergeModulesTasks(state module_manager.ModulesState, lo`
`365`	`365`	`ModuleName: moduleName,`
`366`	`366`	`})`
`367`	`367`	`modulesTasks = append(modulesTasks, newTask.WithQueuedAt(queuedAt))`
	`368`	`+`
	`369`	`+ s.functionalScheduler.Remove(moduleName)`
`368`	`370`	`}`
`369`	`371`
`370`	`372`	`// Add ModuleRun tasks to install or reload enabled modules.`
`@@ -381,6 +383,7 @@ func (s Task) CreateConvergeModulesTasks(state module_manager.ModulesState, lo`
`381`	`383`	`// skip functional modules`
`382`	`384`	`if !s.moduleManager.GetCritical(modules[0]) {`
`383`	`385`	`functionalModules = append(functionalModules, modules...)`
	`386`	`+ continue`
`384`	`387`	`}`
`385`	`388`
`386`	`389`	`newLogLabels := utils.MergeLabels(logLabels)`