Only warn when pcieRoot can't be determined

Signed-off-by: Jon Huhn <[email protected]>

Author: nojnhuh

cmd/gpu-kubelet-plugin/deviceinfo.go

@@ -41,7 +41,7 @@ type GpuInfo struct {
 	driverVersion         string
 	cudaDriverVersion     string
 	pcieBusID             string
-	pcieRootAttr          deviceattribute.DeviceAttribute
+	pcieRootAttr          *deviceattribute.DeviceAttribute
 	migProfiles           []*MigProfileInfo
 }
 
@@ -56,7 +56,7 @@ type MigDeviceInfo struct {
 	ciProfileInfo *nvml.ComputeInstanceProfileInfo
 	ciInfo        *nvml.ComputeInstanceInfo
 	pcieBusID     string
-	pcieRootAttr  deviceattribute.DeviceAttribute
+	pcieRootAttr  *deviceattribute.DeviceAttribute
 }
 
 type MigProfileInfo struct {
@@ -125,14 +125,16 @@ func (d *GpuInfo) GetDevice() resourceapi.Device {
 			"pcieBusID": {
 				StringValue: &d.pcieBusID,
 			},
-			d.pcieRootAttr.Name: d.pcieRootAttr.Value,
 		},
 		Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
 			"memory": {
 				Value: *resource.NewQuantity(int64(d.memoryBytes), resource.BinarySI),
 			},
 		},
 	}
+	if d.pcieRootAttr != nil {
+		device.Attributes[d.pcieRootAttr.Name] = d.pcieRootAttr.Value
+	}
 	return device
 }
 
@@ -179,7 +181,6 @@ func (d *MigDeviceInfo) GetDevice() resourceapi.Device {
 			"pcieBusID": {
 				StringValue: &d.pcieBusID,
 			},
-			d.pcieRootAttr.Name: d.pcieRootAttr.Value,
 		},
 		Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
 			"multiprocessors": {
@@ -199,5 +200,8 @@ func (d *MigDeviceInfo) GetDevice() resourceapi.Device {
 			Value: *resource.NewQuantity(1, resource.BinarySI),
 		}
 	}
+	if d.pcieRootAttr != nil {
+		device.Attributes[d.pcieRootAttr.Name] = d.pcieRootAttr.Value
+	}
 	return device
 }

cmd/gpu-kubelet-plugin/nvlib.go

@@ -201,9 +201,11 @@ func (l deviceLib) getGpuInfo(index int, device nvdev.Device) (*GpuInfo, error)
 		return nil, fmt.Errorf("error getting PCIe bus ID for device %d: %w", index, err)
 	}
 
-	pcieRootAttr, err := deviceattribute.GetPCIeRootAttributeByPCIBusID(pcieBusID)
-	if err != nil {
-		return nil, fmt.Errorf("error getting PCIe root for device %d: %w", index, err)
+	var pcieRootAttr *deviceattribute.DeviceAttribute
+	if attr, err := deviceattribute.GetPCIeRootAttributeByPCIBusID(pcieBusID); err == nil {
+		pcieRootAttr = &attr
+	} else {
+		klog.Warningf("error getting PCIe root for device %d, continuing without attribute: %v", index, err)
 	}
 
 	var migProfiles []*MigProfileInfo