From b1341c879575b88e56a64c7327d3033c41791685 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 7 Mar 2024 12:39:04 -0500 Subject: [PATCH] Revert portion of the GPU testcase Signed-off-by: Davanum Srinivas --- test/e2e/scheduling/nvidia-gpus.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/scheduling/nvidia-gpus.go b/test/e2e/scheduling/nvidia-gpus.go index 76fcfbe3cff..f8c3121cbbc 100644 --- a/test/e2e/scheduling/nvidia-gpus.go +++ b/test/e2e/scheduling/nvidia-gpus.go @@ -147,14 +147,12 @@ func SetupNVIDIAGPUNode(ctx context.Context, f *framework.Framework, setupResour var err error var ds *appsv1.DaemonSet - dsNamespace := f.Namespace.Name dsYamlURLFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET") if dsYamlURLFromEnv != "" { // Using DaemonSet from remote URL framework.Logf("Using remote nvidia-driver-installer daemonset manifest from %v", dsYamlURLFromEnv) ds, err = e2emanifest.DaemonSetFromURL(ctx, dsYamlURLFromEnv) framework.ExpectNoError(err, "failed get remote") - dsNamespace = ds.Namespace } else { // Using default local DaemonSet framework.Logf("Using default local nvidia-driver-installer daemonset manifest.") @@ -164,11 +162,13 @@ func SetupNVIDIAGPUNode(ctx context.Context, f *framework.Framework, setupResour framework.ExpectNoError(err, "failed to parse local manifest for nvidia-driver-installer daemonset") } gpuResourceName = e2egpu.NVIDIAGPUResourceName - _, err = f.ClientSet.AppsV1().DaemonSets(dsNamespace).Create(ctx, ds, metav1.CreateOptions{}) + ds.Namespace = f.Namespace.Name + + _, err = f.ClientSet.AppsV1().DaemonSets(ds.Namespace).Create(ctx, ds, metav1.CreateOptions{}) framework.ExpectNoError(err, "failed to create nvidia-driver-installer daemonset") framework.Logf("Successfully created daemonset to install Nvidia drivers.") - pods, err := e2eresource.WaitForControlledPods(ctx, f.ClientSet, dsNamespace, ds.Name, extensionsinternal.Kind("DaemonSet")) + pods, err := e2eresource.WaitForControlledPods(ctx, f.ClientSet, ds.Namespace, ds.Name, extensionsinternal.Kind("DaemonSet")) framework.ExpectNoError(err, "failed to get pods controlled by the nvidia-driver-installer daemonset") devicepluginPods, err := e2eresource.WaitForControlledPods(ctx, f.ClientSet, "kube-system", "nvidia-gpu-device-plugin", extensionsinternal.Kind("DaemonSet"))