Add DRIVER_VERSION and KERNEL_MODULE_TYPE env vars to k8s-driver-manager init container for ClusterPolicy controller

Signed-off-by: Karthik Vetrivel <[email protected]>

Author: karthikvetrivel

controllers/object_controls.go

@@ -160,6 +160,8 @@ const (
 	OpenKernelModulesEnabledEnvName = "OPEN_KERNEL_MODULES_ENABLED"
 	// KernelModuleTypeEnvName is the name of the driver-container envvar to set the desired kernel module type
 	KernelModuleTypeEnvName = "KERNEL_MODULE_TYPE"
+	// DriverVersionEnvName is the name of the envvar to set the desired driver version
+	DriverVersionEnvName = "DRIVER_VERSION"
 	// MPSRootEnvName is the name of the envvar for configuring the MPS root
 	MPSRootEnvName = "MPS_ROOT"
 	// DefaultMPSRoot is the default MPS root path on the host
@@ -1002,7 +1004,7 @@ func TransformDriver(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicySpec, n C
 	}
 
 	// update driver-manager initContainer
-	err = transformDriverManagerInitContainer(obj, &config.Driver.Manager, config.Driver.GPUDirectRDMA)
+	err = transformDriverManagerInitContainer(obj, &config.Driver.Manager, config.Driver.GPUDirectRDMA, config.Driver.Version, config.Driver.KernelModuleType)
 	if err != nil {
 		return err
 	}
@@ -1050,7 +1052,7 @@ func TransformDriver(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicySpec, n C
 // TransformVGPUManager transforms NVIDIA vGPU Manager daemonset with required config as per ClusterPolicy
 func TransformVGPUManager(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicySpec, n ClusterPolicyController) error {
 	// update k8s-driver-manager initContainer
-	err := transformDriverManagerInitContainer(obj, &config.VGPUManager.DriverManager, nil)
+	err := transformDriverManagerInitContainer(obj, &config.VGPUManager.DriverManager, nil, config.VGPUManager.Version, "")
 	if err != nil {
 		return fmt.Errorf("failed to transform k8s-driver-manager initContainer for vGPU Manager: %v", err)
 	}
@@ -2009,7 +2011,7 @@ func TransformKataManager(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicySpec
 // TransformVFIOManager transforms VFIO-PCI Manager daemonset with required config as per ClusterPolicy
 func TransformVFIOManager(obj *appsv1.DaemonSet, config *gpuv1.ClusterPolicySpec, n ClusterPolicyController) error {
 	// update k8s-driver-manager initContainer
-	err := transformDriverManagerInitContainer(obj, &config.VFIOManager.DriverManager, nil)
+	err := transformDriverManagerInitContainer(obj, &config.VFIOManager.DriverManager, nil, config.VFIOManager.Version, "")
 	if err != nil {
 		return fmt.Errorf("failed to transform k8s-driver-manager initContainer for VFIO Manager: %v", err)
 	}
@@ -2741,7 +2743,7 @@ func transformConfigManagerSidecarContainer(obj *appsv1.DaemonSet, config *gpuv1
 	return nil
 }
 
-func transformDriverManagerInitContainer(obj *appsv1.DaemonSet, driverManagerSpec *gpuv1.DriverManagerSpec, rdmaSpec *gpuv1.GPUDirectRDMASpec) error {
+func transformDriverManagerInitContainer(obj *appsv1.DaemonSet, driverManagerSpec *gpuv1.DriverManagerSpec, rdmaSpec *gpuv1.GPUDirectRDMASpec, driverVersion string, kernelModuleType string) error {
 	container := findContainerByName(obj.Spec.Template.Spec.InitContainers, "k8s-driver-manager")
 
 	if container == nil {
@@ -2765,6 +2767,16 @@ func transformDriverManagerInitContainer(obj *appsv1.DaemonSet, driverManagerSpe
 		}
 	}
 
+	// set driver version for config change detection
+	if driverVersion != "" {
+		setContainerEnv(container, DriverVersionEnvName, driverVersion)
+	}
+
+	// set kernel module type for config change detection
+	if kernelModuleType != "" {
+		setContainerEnv(container, KernelModuleTypeEnvName, kernelModuleType)
+	}
+
 	// set/append environment variables for driver-manager initContainer
 	if len(driverManagerSpec.Env) > 0 {
 		for _, env := range driverManagerSpec.Env {

controllers/transforms_test.go

@@ -1937,10 +1937,12 @@ func newBoolPtr(b bool) *bool {
 
 func TestTransformDriverManagerInitContainer(t *testing.T) {
 	testCases := []struct {
-		description string
-		ds          Daemonset
-		cpSpec      *gpuv1.ClusterPolicySpec
-		expectedDs  Daemonset
+		description      string
+		ds               Daemonset
+		cpSpec           *gpuv1.ClusterPolicySpec
+		driverVersion    string
+		kernelModuleType string
+		expectedDs       Daemonset
 	}{
 		{
 			description: "transform k8s-driver-manager initContainer",
@@ -1963,6 +1965,8 @@ func TestTransformDriverManagerInitContainer(t *testing.T) {
 					},
 				},
 			},
+			driverVersion:    "",
+			kernelModuleType: "",
 			expectedDs: NewDaemonset().WithInitContainer(corev1.Container{
 				Name:            "k8s-driver-manager",
 				Image:           "nvcr.io/nvidia/cloud-native/k8s-driver-manager:v1.0.0",
@@ -1974,11 +1978,39 @@ func TestTransformDriverManagerInitContainer(t *testing.T) {
 				},
 			}).WithInitContainer(corev1.Container{Name: "dummy"}).WithPullSecret("pull-secret"),
 		},
+		{
+			description: "transform k8s-driver-manager initContainer with driver version and kernel module type",
+			ds: NewDaemonset().
+				WithInitContainer(corev1.Container{Name: "k8s-driver-manager"}).
+				WithInitContainer(corev1.Container{Name: "dummy"}),
+			cpSpec: &gpuv1.ClusterPolicySpec{
+				Driver: gpuv1.DriverSpec{
+					Manager: gpuv1.DriverManagerSpec{
+						Repository:       "nvcr.io/nvidia/cloud-native",
+						Image:            "k8s-driver-manager",
+						Version:          "v1.0.0",
+						ImagePullPolicy:  "IfNotPresent",
+						ImagePullSecrets: []string{"pull-secret"},
+					},
+				},
+			},
+			driverVersion:    "550.90.12",
+			kernelModuleType: "open",
+			expectedDs: NewDaemonset().WithInitContainer(corev1.Container{
+				Name:            "k8s-driver-manager",
+				Image:           "nvcr.io/nvidia/cloud-native/k8s-driver-manager:v1.0.0",
+				ImagePullPolicy: corev1.PullIfNotPresent,
+				Env: []corev1.EnvVar{
+					{Name: DriverVersionEnvName, Value: "550.90.12"},
+					{Name: KernelModuleTypeEnvName, Value: "open"},
+				},
+			}).WithInitContainer(corev1.Container{Name: "dummy"}).WithPullSecret("pull-secret"),
+		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
-			err := transformDriverManagerInitContainer(tc.ds.DaemonSet, &tc.cpSpec.Driver.Manager, tc.cpSpec.Driver.GPUDirectRDMA)
+			err := transformDriverManagerInitContainer(tc.ds.DaemonSet, &tc.cpSpec.Driver.Manager, tc.cpSpec.Driver.GPUDirectRDMA, tc.driverVersion, tc.kernelModuleType)
 			require.NoError(t, err)
 			require.EqualValues(t, tc.expectedDs, tc.ds)
 		})