fix: correct device filter initialization order (#857)

Ensure DevicePluginFilterDevice is initialized before FilterDeviceToRegister.
This fixes the initialization sequence to make device filtering work.

Signed-off-by: Nimbus318 <[email protected]>

Author: Nimbus318

pkg/device-plugin/nvidiadevice/nvinternal/plugin/manager/nvml.go

@@ -43,14 +43,19 @@ type nvmlmanager manager
 
 // GetPlugins returns the plugins associated with the NVML resources available on the node
 func (m *nvmlmanager) GetPlugins() ([]plugin.Interface, error) {
+	sConfig, mode, err := plugin.LoadNvidiaDevicePluginConfig()
+	if err != nil {
+		return nil, fmt.Errorf("failed to load nvidia plugin config: %v", err)
+	}
+
 	rms, err := rm.NewNVMLResourceManagers(m.nvmllib, m.config)
 	if err != nil {
 		return nil, fmt.Errorf("failed to construct NVML resource managers: %v", err)
 	}
 
 	var plugins []plugin.Interface
 	for _, r := range rms {
-		plugins = append(plugins, plugin.NewNvidiaDevicePlugin(m.config, r, m.cdiHandler, m.cdiEnabled))
+		plugins = append(plugins, plugin.NewNvidiaDevicePlugin(m.config, r, m.cdiHandler, m.cdiEnabled, sConfig, mode))
 	}
 	return plugins, nil
 }

pkg/device-plugin/nvidiadevice/nvinternal/plugin/manager/tegra.go

@@ -43,14 +43,19 @@ type tegramanager manager
 
 // GetPlugins returns the plugins associated with the NVML resources available on the node
 func (m *tegramanager) GetPlugins() ([]plugin.Interface, error) {
+	sConfig, mode, err := plugin.LoadNvidiaDevicePluginConfig()
+	if err != nil {
+		return nil, fmt.Errorf("failed to load nvidia plugin config: %v", err)
+	}
+
 	rms, err := rm.NewTegraResourceManagers(m.config)
 	if err != nil {
 		return nil, fmt.Errorf("failed to construct NVML resource managers: %v", err)
 	}
 
 	var plugins []plugin.Interface
 	for _, r := range rms {
-		plugins = append(plugins, plugin.NewNvidiaDevicePlugin(m.config, r, m.cdiHandler, m.cdiEnabled))
+		plugins = append(plugins, plugin.NewNvidiaDevicePlugin(m.config, r, m.cdiHandler, m.cdiEnabled, sConfig, mode))
 	}
 	return plugins, nil
 }

pkg/device-plugin/nvidiadevice/nvinternal/plugin/server.go

@@ -135,21 +135,26 @@ func readFromConfigFile(sConfig *nvidia.NvidiaConfig) (string, error) {
 	return mode, nil
 }
 
-// NewNvidiaDevicePlugin returns an initialized NvidiaDevicePlugin
-func NewNvidiaDevicePlugin(config *nvidia.DeviceConfig, resourceManager rm.ResourceManager, cdiHandler cdi.Interface, cdiEnabled bool) *NvidiaDevicePlugin {
-	_, name := resourceManager.Resource().Split()
-
-	deviceListStrategies, _ := spec.NewDeviceListStrategies(*config.Flags.Plugin.DeviceListStrategy)
-
+func LoadNvidiaDevicePluginConfig() (*device.Config, string, error) {
 	sConfig, err := device.LoadConfig(*ConfigFile)
-	klog.Infoln("reading config=", config, "resourceName", config.ResourceName, "configfile=", *ConfigFile, "sconfig=", sConfig)
 	if err != nil {
 		klog.Fatalf(`failed to load device config file %s: %v`, *ConfigFile, err)
 	}
 	mode, err := readFromConfigFile(&sConfig.NvidiaConfig)
 	if err != nil {
 		klog.Errorf("readFromConfigFile err:%s", err.Error())
 	}
+	return sConfig, mode, nil
+}
+
+// NewNvidiaDevicePlugin returns an initialized NvidiaDevicePlugin
+func NewNvidiaDevicePlugin(config *nvidia.DeviceConfig, resourceManager rm.ResourceManager, cdiHandler cdi.Interface, cdiEnabled bool, sConfig *device.Config, mode string) *NvidiaDevicePlugin {
+	_, name := resourceManager.Resource().Split()
+
+	deviceListStrategies, _ := spec.NewDeviceListStrategies(*config.Flags.Plugin.DeviceListStrategy)
+
+	klog.Infoln("reading config=", config, "resourceName", config.ResourceName, "configfile=", *ConfigFile, "sconfig=", sConfig)
+
 	// Initialize devices with configuration
 	if err := device.InitDevicesWithConfig(sConfig); err != nil {
 		klog.Fatalf("failed to initialize devices: %v", err)