From f5f8ea1f4a51c28749c567bac63ecb4ddf4b1763 Mon Sep 17 00:00:00 2001 From: Yuvarani Shankar Date: Thu, 27 Aug 2026 13:50:17 -0700 Subject: [PATCH] fix: make filesToSign consistent across OpenShift and Ubuntu (NETOP-186) (#356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up to #354: both platforms build the same driver stack (ionic-dkms, pds-dkms, tawk-ipc-dkms) but the filesToSign lists were inconsistent — Ubuntu was missing pds_core.ko and tawk_ipc.ko, OpenShift was missing ib_peer_mem.ko, ib_core.ko, and ib_uverbs.ko. Both lists now include the same 7 modules, differing only in the path prefix (/updates/dkms/ on Ubuntu vs /extra/ on OpenShift). Co-authored-by: Yuva Shankar <11082310+yuva29@users.noreply.github.com> Co-authored-by: Claude Opus 4 (cherry picked from commit 20886ae08ad7e344e386a32668002a75bf444180) --- internal/kmmmodule/kmmmodule.go | 5 +++++ internal/kmmmodule/kmmmodule_test.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/internal/kmmmodule/kmmmodule.go b/internal/kmmmodule/kmmmodule.go index bb878027..c0eaf0e7 100644 --- a/internal/kmmmodule/kmmmodule.go +++ b/internal/kmmmodule/kmmmodule.go @@ -631,14 +631,19 @@ func getNodeSelector(nwConfig *amdv1alpha1.NetworkConfig) map[string]string { func getKmodsToSign(isOpenShift bool, kernelVersion string) []string { if isOpenShift { return []string{ + "/opt/lib/modules/" + kernelVersion + "/extra/ib_peer_mem.ko", "/opt/lib/modules/" + kernelVersion + "/extra/tawk_ipc.ko", "/opt/lib/modules/" + kernelVersion + "/extra/pds_core.ko", "/opt/lib/modules/" + kernelVersion + "/extra/ionic.ko", "/opt/lib/modules/" + kernelVersion + "/extra/ionic_rdma.ko", + "/opt/lib/modules/" + kernelVersion + "/kernel/drivers/infiniband/core/ib_core.ko", + "/opt/lib/modules/" + kernelVersion + "/kernel/drivers/infiniband/core/ib_uverbs.ko", } } return []string{ "/opt/lib/modules/" + kernelVersion + "/updates/dkms/ib_peer_mem.ko", + "/opt/lib/modules/" + kernelVersion + "/updates/dkms/tawk_ipc.ko", + "/opt/lib/modules/" + kernelVersion + "/updates/dkms/pds_core.ko", "/opt/lib/modules/" + kernelVersion + "/updates/dkms/ionic.ko", "/opt/lib/modules/" + kernelVersion + "/updates/dkms/ionic_rdma.ko", "/opt/lib/modules/" + kernelVersion + "/kernel/drivers/infiniband/core/ib_core.ko", diff --git a/internal/kmmmodule/kmmmodule_test.go b/internal/kmmmodule/kmmmodule_test.go index 43faefd4..af53b122 100644 --- a/internal/kmmmodule/kmmmodule_test.go +++ b/internal/kmmmodule/kmmmodule_test.go @@ -236,10 +236,13 @@ var _ = Describe("getKmodsToSign", func() { kv := "5.14.0-427.el9.x86_64" files := getKmodsToSign(true, kv) Expect(files).To(ConsistOf( + "/opt/lib/modules/"+kv+"/extra/ib_peer_mem.ko", "/opt/lib/modules/"+kv+"/extra/tawk_ipc.ko", "/opt/lib/modules/"+kv+"/extra/pds_core.ko", "/opt/lib/modules/"+kv+"/extra/ionic.ko", "/opt/lib/modules/"+kv+"/extra/ionic_rdma.ko", + "/opt/lib/modules/"+kv+"/kernel/drivers/infiniband/core/ib_core.ko", + "/opt/lib/modules/"+kv+"/kernel/drivers/infiniband/core/ib_uverbs.ko", )) }) @@ -248,6 +251,8 @@ var _ = Describe("getKmodsToSign", func() { files := getKmodsToSign(false, kv) Expect(files).To(ConsistOf( "/opt/lib/modules/"+kv+"/updates/dkms/ib_peer_mem.ko", + "/opt/lib/modules/"+kv+"/updates/dkms/tawk_ipc.ko", + "/opt/lib/modules/"+kv+"/updates/dkms/pds_core.ko", "/opt/lib/modules/"+kv+"/updates/dkms/ionic.ko", "/opt/lib/modules/"+kv+"/updates/dkms/ionic_rdma.ko", "/opt/lib/modules/"+kv+"/kernel/drivers/infiniband/core/ib_core.ko",