From a1bbae816852e0d073beaa30fb6244c9e63abe99 Mon Sep 17 00:00:00 2001 From: Kevin Hannon Date: Fri, 26 Jul 2024 09:40:54 -0400 Subject: [PATCH] fix resource health status test failures in unlabeled jobs --- test/e2e/nodefeature/nodefeature.go | 3 +++ test/e2e_node/device_plugin_failures_pod_status_test.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/e2e/nodefeature/nodefeature.go b/test/e2e/nodefeature/nodefeature.go index 46b3ac0de8c..3b0d1bb287d 100644 --- a/test/e2e/nodefeature/nodefeature.go +++ b/test/e2e/nodefeature/nodefeature.go @@ -89,6 +89,9 @@ var ( // TODO: document the feature (owning SIG, when to use this feature for a test) PodResources = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("PodResources")) + // ResourceHealthStatus (SIG-node, resource health Status for device plugins and DRA ) + ResourceHealthStatus = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("ResourceHealthStatus")) + // TODO: document the feature (owning SIG, when to use this feature for a test) ProcMountType = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("ProcMountType")) diff --git a/test/e2e_node/device_plugin_failures_pod_status_test.go b/test/e2e_node/device_plugin_failures_pod_status_test.go index 5c1275bfaa5..ec11478db83 100644 --- a/test/e2e_node/device_plugin_failures_pod_status_test.go +++ b/test/e2e_node/device_plugin_failures_pod_status_test.go @@ -27,18 +27,18 @@ import ( v1 "k8s.io/api/core/v1" kubeletdevicepluginv1beta1 "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + "k8s.io/kubernetes/test/e2e/nodefeature" imageutils "k8s.io/kubernetes/test/utils/image" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e_node/testdeviceplugin" ) -var _ = SIGDescribe("Device Plugin Failures Pod Status:", framework.WithFeatureGate(features.ResourceHealthStatus), func() { +var _ = SIGDescribe("Device Plugin Failures Pod Status", nodefeature.ResourceHealthStatus, func() { f := framework.NewDefaultFramework("device-plugin-failures") f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged