Fix handling of unknown kernels (#670) (#933)

Fix scheduling data generation for nodes that run an unconfigured kernel and do not have the kmod loaded yet. Upstream-Commit: a29ecc3 Co-authored-by: Quentin Barrand <[email protected]>
rh-ecosystem-edge · Dec 19, 2023 · 78a172a · 78a172a
1 parent 1ac1c76
commit 78a172a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/internal/controllers/module_nmc_reconciler.go b/internal/controllers/module_nmc_reconciler.go
@@ -472,9 +472,11 @@ func prepareNodeSchedulingData(node v1.Node, mld *api.ModuleLoaderData, currentN
 		versionLabel, present = utils.GetNodeWorkerPodVersionLabel(node.GetLabels(), mld.Namespace, mld.Name)
 	}
 	switch {
-	case mld == nil && currentNMCs.Has(node.Name):
-		// mld missing, Module does not have mapping for node's kernel, NMC for the node exists
-		return schedulingData{action: actionDelete}
+	case mld == nil:
+		if currentNMCs.Has(node.Name) {
+			// mld missing, Module does not have mapping for node's kernel, NMC for the node exists
+			return schedulingData{action: actionDelete}
+		}
 	case mld.ModuleVersion == "":
 		// mld exists, Version not define, should be running
 		return schedulingData{action: actionAdd, mld: mld, node: &node}

diff --git a/internal/controllers/module_nmc_reconciler_test.go b/internal/controllers/module_nmc_reconciler_test.go
@@ -563,16 +563,27 @@ var _ = Describe("prepareSchedulingData", func() {
 		Expect(scheduleData).To(Equal(map[string]schedulingData{}))
 	})
 
-	It("mld for kernel version does not exists", func() {
-		currentNMCs := sets.New[string](nodeName)
-		mockKernel.EXPECT().GetModuleLoaderDataForKernel(&mod, kernelVersion).Return(nil, module.ErrNoMatchingKernelMapping)
+	DescribeTable(
+		"mld for kernel version does not exists",
+		func(moduleCurrentlyEnabled bool, expectedAction string) {
+			currentNMCs := sets.New[string]()
+			expectedScheduleData := map[string]schedulingData{nodeName: {action: expectedAction}}
 
-		scheduleData, errs := mnrh.prepareSchedulingData(ctx, &mod, targetedNodes, currentNMCs)
+			if moduleCurrentlyEnabled {
+				currentNMCs.Insert(nodeName)
+			}
 
-		expectedScheduleData := map[string]schedulingData{nodeName: schedulingData{action: actionDelete}}
-		Expect(errs).To(BeEmpty())
-		Expect(scheduleData).To(Equal(expectedScheduleData))
-	})
+			mockKernel.EXPECT().GetModuleLoaderDataForKernel(&mod, kernelVersion).Return(nil, module.ErrNoMatchingKernelMapping)
+
+			scheduleData, errs := mnrh.prepareSchedulingData(ctx, &mod, targetedNodes, currentNMCs)
+
+			Expect(errs).To(BeEmpty())
+			Expect(scheduleData).To(Equal(expectedScheduleData))
+		},
+		EntryDescription("module currently enabled in MLD: %t, expected action: %q"),
+		Entry(nil, true, actionDelete),
+		Entry(nil, false, ""),
+	)
 
 	It("mld exists", func() {
 		currentNMCs := sets.New[string](nodeName)