chore(bors): merge pull request #602

602: fix: account for builtin nvme-tcp module in initContainer r=dsharma-dc a=dsharma-dc - If sysfs check pass - driver is available as either loaded already or builtin - If sysfs check fails - driver isn't builtin but can be possibly loaded - For nvme_rdma, a separate change will be done as that is dependent on helm option nvmf.target.rdma.enable <! Co-authored-by: Diwakar Sharma <[email protected]>
openebs · Jan 20, 2025 · c07c05c · c07c05c
2 parents 45c2fea + b33d98a
commit c07c05c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -398,7 +398,7 @@ csi:
       enabled: false
       containers:
         - name: nvme-tcp-probe
-          command: ['sh', '-c', 'trap "exit 1" TERM; until $(lsmod | grep nvme_tcp &>/dev/null); do [ -z "$WARNED" ] && echo "nvme_tcp module not loaded..."; WARNED=1; sleep 60; done;']
+          command: ['sh', '-c', 'trap "exit 1" TERM; until [ -d /sys/module/nvme_tcp ]; do [ -z "$WARNED" ] && echo "nvme_tcp module not loaded..."; WARNED=1; sleep 60; done;']
 
 io_engine:
   # -- Log level for the io-engine service

diff --git a/scripts/k8s/setup-io-prereq.sh b/scripts/k8s/setup-io-prereq.sh
@@ -120,7 +120,7 @@ if [ -n "$HUGE_PAGES" ]; then
 fi
 
 if [ -n "$NVME_TCP" ]; then
-  if ! lsmod | grep "nvme_tcp" >/dev/null; then
+  if ! [ -d "/sys/module/nvme_tcp" ] >/dev/null; then
     if ! modprobe_nvme_tcp >/dev/null; then
       install_kernel_modules
       if ! modprobe_nvme_tcp; then