refactor: Simplify resource manager construction

elezar · elezar · commit b93fb47d3bda · 2026-04-15T10:00:50.000+02:00
In order to prepare for the WSL changes, we remove the tegra resource
manager and pull the basic function implementations into the base type.
This means that the base type is essentially a resource manager that
does not support health checking and always uses distributed allocation.

Signed-off-by: Evan Lezar &lt;elezar@nvidia.com&gt;
diff --git a/internal/rm/nvml_manager.go b/internal/rm/nvml_manager.go
@@ -87,7 +87,7 @@ func (r *nvmlResourceManager) GetDevicePaths(ids []string) []string {
 		"/dev/nvidia-modeset",
 	}
 
-	return append(paths, r.Devices().Subset(ids).GetPaths()...)
+	return append(paths, r.resourceManager.GetDevicePaths(ids)...)
 }
 
 // CheckHealth performs health checks on a set of devices, writing to the 'unhealthy' channel with any unhealthy devices
diff --git a/internal/rm/rm.go b/internal/rm/rm.go
@@ -48,6 +48,23 @@ type ResourceManager interface {
 	ValidateRequest(AnnotatedIDs) error
 }
 
+var _ ResourceManager = (*resourceManager)(nil)
+
+// CheckHealth is disabled on the base resourceManager.
+func (r *resourceManager) CheckHealth(stop <-chan interface{}, unhealthy chan<- *Device) error {
+	return nil
+}
+
+// GetDevicePaths returns the paths for the devices associated with the resource manager.
+func (r *resourceManager) GetDevicePaths(ids []string) []string {
+	return r.Devices().Subset(ids).GetPaths()
+}
+
+// GetPreferredAllocation runs an allocation algorithm over the inputs.
+func (r *resourceManager) GetPreferredAllocation(available, required []string, size int) ([]string, error) {
+	return r.distributedAlloc(available, required, size)
+}
+
 // Resource gets the resource name associated with the ResourceManager
 func (r *resourceManager) Resource() spec.ResourceName {
 	return r.resource
diff --git a/internal/rm/tegra_manager.go b/internal/rm/tegra_manager.go
@@ -22,12 +22,6 @@ import (
 	spec "github.com/NVIDIA/k8s-device-plugin/api/config/v1"
 )
 
-type tegraResourceManager struct {
-	resourceManager
-}
-
-var _ ResourceManager = (*tegraResourceManager)(nil)
-
 // NewTegraResourceManagers returns a set of ResourceManagers for tegra resources
 func NewTegraResourceManagers(config *spec.Config) ([]ResourceManager, error) {
 	deviceMap, err := buildTegraDeviceMap(config)
@@ -45,32 +39,13 @@ func NewTegraResourceManagers(config *spec.Config) ([]ResourceManager, error) {
 		if len(devices) == 0 {
 			continue
 		}
-		r := &tegraResourceManager{
-			resourceManager: resourceManager{
-				config:   config,
-				resource: resourceName,
-				devices:  devices,
-			},
-		}
-		if len(devices) != 0 {
-			rms = append(rms, r)
+		r := &resourceManager{
+			config:   config,
+			resource: resourceName,
+			devices:  devices,
 		}
+		rms = append(rms, r)
 	}
 
 	return rms, nil
 }
-
-// GetPreferredAllocation returns a standard allocation for the Tegra resource manager.
-func (r *tegraResourceManager) GetPreferredAllocation(available, required []string, size int) ([]string, error) {
-	return r.distributedAlloc(available, required, size)
-}
-
-// GetDevicePaths returns an empty slice for the tegraResourceManager
-func (r *tegraResourceManager) GetDevicePaths(ids []string) []string {
-	return nil
-}
-
-// CheckHealth is disabled for the tegraResourceManager
-func (r *tegraResourceManager) CheckHealth(stop <-chan interface{}, unhealthy chan<- *Device) error {
-	return nil
-}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (r *nvmlResourceManager) GetDevicePaths(ids []string) []string {`
`87`	`87`	`"/dev/nvidia-modeset",`
`88`	`88`	`}`
`89`	`89`
`90`		`- return append(paths, r.Devices().Subset(ids).GetPaths()...)`
	`90`	`+ return append(paths, r.resourceManager.GetDevicePaths(ids)...)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`// CheckHealth performs health checks on a set of devices, writing to the 'unhealthy' channel with any unhealthy devices`