Make ComptueDomains with DNS names the default

Signed-off-by: Kevin Klues <[email protected]>

Author: klueska

cmd/compute-domain-kubelet-plugin/main.go

@@ -27,16 +27,19 @@ import (
 
 	"github.com/urfave/cli/v2"
 
+	"k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/dynamic-resource-allocation/kubeletplugin"
 	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/k8s-dra-driver-gpu/internal/info"
+	"github.com/NVIDIA/k8s-dra-driver-gpu/pkg/featuregates"
 	"github.com/NVIDIA/k8s-dra-driver-gpu/pkg/flags"
 )
 
 const (
-	DriverName                         = "compute-domain.nvidia.com"
-	DriverPluginCheckpointFileBasename = "checkpoint.json"
+	DriverName                              = "compute-domain.nvidia.com"
+	DriverPluginCheckpointFileBasename      = "checkpoint.json"
+	IMEXDaemonsWithDNSNamesMinDriverVersion = "570.158.01"
 )
 
 type Flags struct {
@@ -186,6 +189,13 @@ func newApp() *cli.App {
 
 // RunPlugin initializes and runs the compute domain kubelet plugin.
 func RunPlugin(ctx context.Context, config *Config) error {
+	// Check driver version if IMEXDaemonsWithDNSNames feature gate is enabled
+	if featuregates.Enabled(featuregates.IMEXDaemonsWithDNSNames) {
+		if err := validateDriverVersionForIMEXDaemonsWithDNSNames(config.flags); err != nil {
+			return fmt.Errorf("driver version validation failed: %w", err)
+		}
+	}
+
 	// Create the plugin directory
 	err := os.MkdirAll(config.DriverPluginPath(), 0750)
 	if err != nil {
@@ -263,3 +273,35 @@ func (c Config) setNvidiaCDIHookPath() error {
 
 	return nil
 }
+
+// validateDriverVersionForIMEXDaemonsWithDNSNames validates that the driver version
+// meets the minimum requirement for the IMEXDaemonsWithDNSNames feature gate.
+func validateDriverVersionForIMEXDaemonsWithDNSNames(flags *Flags) error {
+	klog.Infof("Starting driver version validation for IMEXDaemonsWithDNSNames feature...")
+	klog.Infof("Minimum required version: %s", IMEXDaemonsWithDNSNamesMinDriverVersion)
+
+	containerDriverRoot := root(flags.containerDriverRoot)
+	nvdevlib, err := newDeviceLib(containerDriverRoot)
+	if err != nil {
+		return fmt.Errorf("failed to create device library: %w", err)
+	}
+
+	driverVer, err := nvdevlib.getDriverVersion()
+	if err != nil {
+		return fmt.Errorf("error getting driver version: %w", err)
+	}
+
+	minVersion, err := version.ParseGeneric(IMEXDaemonsWithDNSNamesMinDriverVersion)
+	if err != nil {
+		return fmt.Errorf("error parsing minimum version: %w", err)
+	}
+
+	if driverVer.LessThan(minVersion) {
+		klog.Errorf("IMEXDaemonsWithDNSNames feature requires driver version >= %s, but found %s", minVersion.String(), driverVer.String())
+		klog.Errorf("If installed via helm, set featureGates.IMEXDaemonsWithDNSNames=false to run without this feature.")
+		return fmt.Errorf("minimum version not satisfied")
+	}
+
+	klog.Infof("Driver version validation passed: %s >= %s", driverVer.String(), minVersion.String())
+	return nil
+}

cmd/compute-domain-kubelet-plugin/nvlib.go

@@ -26,6 +26,7 @@ import (
 	"strconv"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/klog/v2"
 	"k8s.io/mount-utils"
 
@@ -388,3 +389,24 @@ func (l deviceLib) unmountRecursively(root string) error {
 
 	return helper(root)
 }
+
+// getDriverVersion returns the version of the NVIDIA driver.
+func (l deviceLib) getDriverVersion() (*version.Version, error) {
+	if err := l.init(); err != nil {
+		return nil, fmt.Errorf("error initializing NVML: %w", err)
+	}
+	defer l.alwaysShutdown()
+
+	driverVersion, ret := l.nvmllib.SystemGetDriverVersion()
+	if ret != nvml.SUCCESS {
+		return nil, fmt.Errorf("error getting driver version: %v", ret)
+	}
+
+	// Parse the version using Kubernetes version utilities
+	v, err := version.ParseGeneric(driverVersion)
+	if err != nil {
+		return nil, fmt.Errorf("invalid driver version format '%s': %w", driverVersion, err)
+	}
+
+	return v, nil
+}

pkg/featuregates/featuregates.go

@@ -61,8 +61,8 @@ var defaultFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
 	},
 	IMEXDaemonsWithDNSNames: {
 		{
-			Default:    false,
-			PreRelease: featuregate.Alpha,
+			Default:    true,
+			PreRelease: featuregate.Beta,
 			Version:    version.MajorMinor(25, 8),
 		},
 	},