[fix] ensure conversion hooks: skip removed module, fix stale comment

Signed-off-by: Artem Kuleshov <artem.kuleshov@flant.com>

Author: Fkuloff

pkg/task/tasks/converge-modules/task.go

@@ -445,7 +445,7 @@ func (s *Task) CreateConvergeModulesTasks(state *module_manager.ModulesState, lo
 					doModuleStartup = true
 				}
 
-				// add EnsureHooks task for every enabled module, right after EnsureCRDs
+				// add EnsureHooks after the optional EnsureCRDs, before ModuleRun
 				if s.moduleManager.ModuleHasConversionWebhooks(moduleName) {
 					resultingTasks = append(resultingTasks, s.newEnsureHooksTask(moduleName, newLogLabels, queuedAt))
 				}
@@ -495,7 +495,7 @@ func (s *Task) CreateConvergeModulesTasks(state *module_manager.ModulesState, lo
 				doModuleStartup = true
 			}
 
-			// add EnsureHooks task for every enabled module, right after EnsureCRDs
+			// add EnsureHooks after the optional EnsureCRDs, before ModuleRun
 			if s.moduleManager.ModuleHasConversionWebhooks(modules[0]) {
 				resultingTasks = append(resultingTasks, s.newEnsureHooksTask(modules[0], newLogLabels, queuedAt))
 			}
@@ -551,7 +551,7 @@ func (s *Task) CreateConvergeModulesTasks(state *module_manager.ModulesState, lo
 			doModuleStartup = true
 		}
 
-		// add EnsureHooks task for every enabled module, right after EnsureCRDs
+		// add EnsureHooks after the optional EnsureCRDs, before ModuleRun
 		if s.moduleManager.ModuleHasConversionWebhooks(module) {
 			resultingTasks = append(resultingTasks, s.newEnsureHooksTask(module, newLogLabels, queuedAt))
 		}

pkg/task/tasks/module-ensure-hooks/task.go

@@ -69,6 +69,12 @@ func (s *Task) Handle(ctx context.Context) queue.TaskResult {
 	}
 
 	baseModule := s.moduleManager.GetModule(hm.ModuleName)
+	if baseModule == nil {
+		// The module was removed between enqueue and execution; nothing to ensure.
+		s.logger.Debug("module not found, skipping ensureHooks", slog.String(pkg.LogKeyName, hm.ModuleName))
+
+		return res
+	}
 
 	s.logger.Debug("Module ensureHooks", slog.String(pkg.LogKeyName, hm.ModuleName))