Skip to content

[CP 333] fix: set InTreeModuleToRemove for KMM to unload in-tree ionic driver (NETOP-176) #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sundar-pds merged 1 commit into from
Jun 23, 2026
Merged

[CP 333] fix: set InTreeModuleToRemove for KMM to unload in-tree ionic driver (NETOP-176) #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions internal/kmmmodule/kmmmodule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,9 @@ func (km *kmmModule) setKMMModuleLoader(ctx context.Context, mod *kmmv1beta1.Mod
func getKernelMappings(nwConfig *amdv1alpha1.NetworkConfig, isOpenshift bool, nodes *v1.NodeList) ([]kmmv1beta1.KernelMapping, string, error) {

inTreeModuleToRemove := ""
if isOpenshift {
inTreeModuleToRemove = ionicModuleName
}

if nodes == nil || len(nodes.Items) == 0 {
return nil, "", fmt.Errorf("No nodes found for the label selector %s", MapToLabelSelector(nwConfig.Spec.Selector))
Expand Down Expand Up @@ -495,14 +498,17 @@ func getKM(nwConfig *amdv1alpha1.NetworkConfig, node v1.Node, inTreeModuleToRemo
}
}

return kmmv1beta1.KernelMapping{
Literal: node.Status.NodeInfo.KernelVersion,
ContainerImage: driversImage,
InTreeModuleToRemove: inTreeModuleToRemove,
Build: kmmBuild,
Sign: kmmSign,
RegistryTLS: registryTLS,
}, driversVersion, nil
km := kmmv1beta1.KernelMapping{
Literal: node.Status.NodeInfo.KernelVersion,
ContainerImage: driversImage,
Build: kmmBuild,
Sign: kmmSign,
RegistryTLS: registryTLS,
}
if inTreeModuleToRemove != "" {
km.InTreeModulesToRemove = []string{inTreeModuleToRemove}
}
return km, driversVersion, nil
}

func addNodeInfoSuffixToImageTag(imgStr string, osName, driversVersion string) string {
Expand Down
36 changes: 35 additions & 1 deletion internal/kmmmodule/kmmmodule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ var _ = Describe("BaseImageRegistry and BaseImageRegistryTLS", func() {
},
}

km, _, err := getKM(nwConfig, node, "", true) // isOpenShift = true
km, _, err := getKM(nwConfig, node, "ionic", true) // isOpenShift = true

Expect(err).To(BeNil())
Expect(km.Build).NotTo(BeNil())
Expand All @@ -231,6 +231,40 @@ var _ = Describe("BaseImageRegistry and BaseImageRegistryTLS", func() {
})
})

var _ = Describe("getKernelMappings", func() {
newNetworkConfig := func() *amdv1alpha1.NetworkConfig {
return &amdv1alpha1.NetworkConfig{
ObjectMeta: metav1.ObjectMeta{
Name: "test-config",
Namespace: "test-ns",
},
Spec: amdv1alpha1.NetworkConfigSpec{
Driver: amdv1alpha1.DriverSpec{
Version: "6.2.2",
},
},
}
}

It("should set InTreeModulesToRemove to ionic on OpenShift", func() {
kms, _, err := getKernelMappings(newNetworkConfig(), true, testNodeList)
Expect(err).To(BeNil())
Expect(kms).NotTo(BeEmpty())
for _, km := range kms {
Expect(km.InTreeModulesToRemove).To(Equal([]string{"ionic"}))
}
})

It("should not set InTreeModulesToRemove on Kubernetes", func() {
kms, _, err := getKernelMappings(newNetworkConfig(), false, testNodeList)
Expect(err).To(BeNil())
Expect(kms).NotTo(BeEmpty())
for _, km := range kms {
Expect(km.InTreeModulesToRemove).To(BeNil())
}
})
})

var _ = PDescribe("setKMMModuleLoader", func() {
It("KMM module creation - default input values", func() {
mod := kmmv1beta1.Module{
Expand Down
Loading