[no-relnote] E2E Create test objects from file

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

tests/e2e/Makefile

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. 
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. 
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

tests/e2e/README.md

@@ -170,5 +170,5 @@ This test code is released under the same license as the NVIDIA k8s‑device‑
 ## 11  References
 * [Ginkgo v2](https://github.com/onsi/ginkgo)
 * [mittwald/go‑helm‑client](https://github.com/mittwald/go-helm-client)
-* [Kubernetes‑sigs/Node Feature Discovery](https://github.com/kubernetes-sigs/node-feature-discovery)
+* [kubernetes‑sigs/node-feature-discovery](https://github.com/kubernetes-sigs/node-feature-discovery)
 * [Kubernetes blog – *End‑to‑End Testing for Everyone*](https://kubernetes.io/blog/2020/07/27/kubernetes-e2e-testing-for-everyone/)

tests/e2e/cleanup_test.go

@@ -17,7 +17,6 @@
 package e2e
 
 import (
-	"context"
 	"fmt"
 	"strings"
 	"time"
@@ -41,8 +40,8 @@ func cleanupNamespaceResources(namespace string) {
 	err = cleanupHelmDeployments(namespace)
 	Expect(err).NotTo(HaveOccurred())
 
-	cleanupNode(ctx, clientSet)
-	cleanupNFDObjects(ctx, nfdClient, testNamespace.Name)
+	cleanupNode(clientSet)
+	cleanupNFDObjects(nfdClient, testNamespace.Name)
 	cleanupCRDs()
 }
 
@@ -145,7 +144,7 @@ func cleanupCRDs() {
 
 // cleanupNode deletes all NFD/GFD related metadata from the Node object, i.e.
 // labels and annotations
-func cleanupNode(ctx context.Context, cs clientset.Interface) {
+func cleanupNode(cs clientset.Interface) {
 	// Per-node cleanup function
 	cleanup := func(nodeName string) error {
 		node, err := cs.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
@@ -236,13 +235,13 @@ func cleanupNode(ctx context.Context, cs clientset.Interface) {
 	}
 }
 
-func cleanupNFDObjects(ctx context.Context, cli *nfdclient.Clientset, namespace string) {
-	cleanupNodeFeatureRules(ctx, cli)
-	cleanupNodeFeatures(ctx, cli, namespace)
+func cleanupNFDObjects(cli *nfdclient.Clientset, namespace string) {
+	cleanupNodeFeatureRules(cli)
+	cleanupNodeFeatures(cli, namespace)
 }
 
 // cleanupNodeFeatures deletes all NodeFeature objects in the given namespace
-func cleanupNodeFeatures(ctx context.Context, cli *nfdclient.Clientset, namespace string) {
+func cleanupNodeFeatures(cli *nfdclient.Clientset, namespace string) {
 	nfs, err := cli.NfdV1alpha1().NodeFeatures(namespace).List(ctx, metav1.ListOptions{})
 	if errors.IsNotFound(err) {
 		// Omitted error, nothing to do.
@@ -264,7 +263,7 @@ func cleanupNodeFeatures(ctx context.Context, cli *nfdclient.Clientset, namespac
 }
 
 // cleanupNodeFeatureRules deletes all NodeFeatureRule objects
-func cleanupNodeFeatureRules(ctx context.Context, cli *nfdclient.Clientset) {
+func cleanupNodeFeatureRules(cli *nfdclient.Clientset) {
 	nfrs, err := cli.NfdV1alpha1().NodeFeatureRules().List(ctx, metav1.ListOptions{})
 	if errors.IsNotFound(err) {
 		// Omitted error, nothing to do.

tests/e2e/data/job-1.yaml

@@ -0,0 +1,25 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: j-e2e-1
+  labels:
+    app.nvidia.com: k8s-device-plugin-test-app
+spec:
+  template:
+    metadata:
+      name: gpu-pod
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: cuda-container
+          image: nvcr.io/nvidia/k8s/cuda-sample:nbody-cuda11.7.1-ubuntu18.04
+          args:
+            - "--benchmark"
+            - "--numbodies=10000"
+          resources:
+            limits:
+              nvidia.com/gpu: "1"
+      tolerations:
+        - key: "nvidia.com/gpu"
+          operator: "Exists"
+          effect: "NoSchedule"

tests/e2e/device-plugin_test.go

@@ -133,15 +133,12 @@ var _ = Describe("GPU Device Plugin", Ordered, func() {
 		})
 		It("it should run GPU jobs", func(ctx context.Context) {
 			By("Creating a GPU job")
-			job := newGPUJob(testNamespace.Name)
-			job.Namespace = testNamespace.Name
-
-			_, err := clientSet.BatchV1().Jobs(testNamespace.Name).Create(ctx, job, metav1.CreateOptions{})
+			job, err := CreateOrUpdateJobsFromFile(ctx, clientSet, "job-1.yaml", testNamespace.Name)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for job to complete")
 			Eventually(func() error {
-				job, err := clientSet.BatchV1().Jobs(testNamespace.Name).Get(ctx, job.Name, metav1.GetOptions{})
+				job, err := clientSet.BatchV1().Jobs(testNamespace.Name).Get(ctx, job[0], metav1.GetOptions{})
 				if err != nil {
 					return err
 				}