🐛 wip nic-info.sh (#1524)

 Better GetHardwareDetailsNics. Fixes #1523

Author: benedikt-bartscher

pkg/services/baremetal/client/ssh/nic-info.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+# Copyright 2025 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+trap 'echo "ERROR: A command has failed. Exiting the script. Line was ($0:$LINENO): $(sed -n "${LINENO}p" "$0")"; exit 3' ERR
+set -Eeuo pipefail
+
+for idir in $(echo /sys/class/net/* | sort); do
+    iname=$(basename "$idir")
+
+    # Skip loopback
+    if [ "$iname" = "lo" ]; then
+        continue
+    fi
+
+    # Skip interfaces that are not up
+    if [ "$(cat "$idir/operstate")" != "up" ]; then
+        continue
+    fi
+
+    MAC=$(cat "$idir/address")
+
+    SPEED=$(ethtool "$iname" 2>/dev/null | awk '/Speed:/{print $2}' | sed 's/[^0-9]//g')
+
+    # Grab the PCI bus info via ethtool, then get the model from lspci
+    BUSINFO=$(ethtool -i "$iname" 2>/dev/null | awk '/bus-info:/{print $2}')
+
+    if [ -z "$BUSINFO" ] || [ "$BUSINFO" = "N/A" ]; then
+        MODEL="Unknown model"
+    else
+        MODEL=$(lspci -s "$BUSINFO" | cut -d ' ' -f3- | tr '"' "'")
+    fi
+
+    for ipv4 in $(ip -4 addr show dev "$iname" | awk '/inet /{print $2}'); do
+        echo "name=\"$iname\" model=\"$MODEL\" mac=\"$MAC\" ip=\"$ipv4\" speedMbps=\"$SPEED\""
+    done
+    for ipv6 in $(ip -6 addr show dev "$iname" | awk '/inet6 /{print $2}'); do
+        if [[ "$ipv6" == fe80:* ]]; then
+            continue
+        fi
+        echo "name=\"$iname\" model=\"$MODEL\" mac=\"$MAC\" ip=\"$ipv6\" speedMbps=\"$SPEED\""
+    done
+done

pkg/services/baremetal/client/ssh/ssh_client.go

@@ -48,6 +48,9 @@ var wipeDiskShellScript string
 //go:embed check-disk.sh
 var checkDiskShellScript string
 
+//go:embed nic-info.sh
+var nicInfoShellScript string
+
 var downloadFromOciShellScript = `#!/bin/bash
 
 # Copyright 2023 The Kubernetes Authors.
@@ -316,32 +319,12 @@ func (c *sshClient) GetHardwareDetailsRAM() Output {
 
 // GetHardwareDetailsNics implements the GetHardwareDetailsNics method of the SSHClient interface.
 func (c *sshClient) GetHardwareDetailsNics() Output {
-	out := c.runSSH(`cat << 'EOF_VIA_SSH' > nic-info.sh
-#!/bin/sh
-for iname in $(ip a |awk '/state UP/{print $2}' | sed 's/://')
-do
-
-MAC=\""$(ip a | grep -A2 $iname | awk '/link/{print $2}')\""
-SPEED=\""$(ethtool eth0 |grep "Speed:" | awk '{print $2}' | sed 's/[^0-9]//g')\""
-MODEL=\""$( lspci | grep net | head -1 | awk '{$1=$2=$3=""; print $0}' | sed "s/^[ \t]*//")\""
-IP_V4=\""$(ip a | grep -A2 eth0 | sed -n '/\binet\b/p' | awk '{print $2}')\""
-IP_V6=\""$(ip a | grep -A2 eth0 | sed -n '/\binet6\b/p' | awk '{print $2}')\""
-
-if test -n $IP_V4; then
-	echo "name=\""$iname\""" "model=$MODEL" "mac=$MAC" "ip=$IP_V4" "speedMbps=$SPEED"
-fi
-
-if test -n $IP_V6; then
-	echo "name=\""$iname\""" "model=$MODEL" "mac=$MAC" "ip=$IP_V6" "speedMbps=$SPEED"
-fi
-
-done
-EOF_VIA_SSH`)
-	if out.Err != nil || out.StdErr != "" {
-		return out
-	}
-
-	return c.runSSH("sh nic-info.sh")
+	return c.runSSH(fmt.Sprintf(`cat >/root/nic-info.sh <<'EOF_VIA_SSH'
+%s
+EOF_VIA_SSH
+chmod a+rx /root/nic-info.sh
+/root/nic-info.sh
+`, nicInfoShellScript))
 }
 
 // GetHardwareDetailsStorage implements the GetHardwareDetailsStorage method of the SSHClient interface.

pkg/services/baremetal/host/host.go

@@ -849,26 +849,32 @@ func obtainHardwareDetailsNics(sshClient sshclient.Client) ([]infrav1.NIC, error
 	}
 
 	stringArray := strings.Split(stdOut, "\n")
-	nicsArray := make([]infrav1.NIC, len(stringArray))
+	nicsArray := make([]infrav1.NIC, 0, len(stringArray))
 
-	for i, str := range stringArray {
+	for _, str := range stringArray {
 		validJSONString := validJSONFromSSHOutput(str)
 
 		var nic originalNic
 		if err := json.Unmarshal([]byte(validJSONString), &nic); err != nil {
 			return nil, fmt.Errorf("failed to unmarshal %v. Original ssh output %s: %w", validJSONString, stdOut, err)
 		}
+
+		// speedMbps can be empty
+		if nic.SpeedMbps == "" {
+			nic.SpeedMbps = "0"
+		}
 		speedMbps, err := strconv.Atoi(nic.SpeedMbps)
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse int from string %s: %w", nic.SpeedMbps, err)
 		}
-		nicsArray[i] = infrav1.NIC{
+
+		nicsArray = append(nicsArray, infrav1.NIC{
 			Name:      nic.Name,
 			Model:     nic.Model,
 			MAC:       nic.MAC,
 			IP:        nic.IP,
 			SpeedMbps: speedMbps,
-		}
+		})
 	}
 
 	return nicsArray, nil