Merge pull request #8443 from honza/master-nil

openshift-merge-bot[bot] · web-flow · commit 03780e07db8a · 2024-06-07T22:27:00.000Z
OCPBUGS-34082: baremetal: check if HardwareDetails is nil
diff --git a/pkg/infrastructure/baremetal/variables.go b/pkg/infrastructure/baremetal/variables.go
@@ -99,6 +99,13 @@ func getMasterAddresses(dir string) ([]string, error) {
 	}
 
 	for _, bmh := range hosts {
+		logrus.Debug("  bmh:", bmh.Name)
+
+		if bmh.Status.HardwareDetails == nil {
+			logrus.Debug("    HardwareDetails nil, skipping")
+			continue
+		}
+
 		for _, nic := range bmh.Status.HardwareDetails.NIC {
 			masters = append(masters, nic.IP)
 		}

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,13 @@ func getMasterAddresses(dir string) ([]string, error) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`for _, bmh := range hosts {`
	`102`	`+ logrus.Debug(" bmh:", bmh.Name)`
	`103`	`+`
	`104`	`+ if bmh.Status.HardwareDetails == nil {`
	`105`	`+ logrus.Debug(" HardwareDetails nil, skipping")`
	`106`	`+ continue`
	`107`	`+ }`
	`108`	`+`
`102`	`109`	`for _, nic := range bmh.Status.HardwareDetails.NIC {`
`103`	`110`	`masters = append(masters, nic.IP)`
`104`	`111`	`}`