diff --git a/test/e2e_node/device_plugin_test.go b/test/e2e_node/device_plugin_test.go index e4d598348f9..5b3d9c750ed 100644 --- a/test/e2e_node/device_plugin_test.go +++ b/test/e2e_node/device_plugin_test.go @@ -828,3 +828,26 @@ func matchContainerDevices(ident string, contDevs []*kubeletpodresourcesv1.Conta } return nil } + +// getSampleDevicePluginPod returns the Sample Device Plugin pod to be used e2e tests. +func getSampleDevicePluginPod(pluginSockDir string) *v1.Pod { + data, err := e2etestfiles.Read(SampleDevicePluginDSYAML) + if err != nil { + framework.Fail(err.Error()) + } + + ds := readDaemonSetV1OrDie(data) + dp := &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: SampleDevicePluginName, + }, + Spec: ds.Spec.Template.Spec, + } + for i := range dp.Spec.Containers[0].Env { + if dp.Spec.Containers[0].Env[i].Name == SampleDeviceEnvVarNamePluginSockDir { + dp.Spec.Containers[0].Env[i].Value = pluginSockDir + } + } + + return dp +} diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index e6e7da29766..aabe5a25da7 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -24,16 +24,13 @@ import ( "sync" "time" - v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" commontest "k8s.io/kubernetes/test/e2e/common" - "k8s.io/kubernetes/test/e2e/framework" e2egpu "k8s.io/kubernetes/test/e2e/framework/gpu" e2emanifest "k8s.io/kubernetes/test/e2e/framework/manifest" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" @@ -244,29 +241,6 @@ func getContainerImageFromE2ETestDaemonset(dsYamlPath string) (string, error) { return ds.Spec.Template.Spec.Containers[0].Image, nil } -// getSampleDevicePluginPod returns the Sample Device Plugin pod to be used e2e tests. -func getSampleDevicePluginPod(pluginSockDir string) *v1.Pod { - data, err := e2etestfiles.Read(SampleDevicePluginDSYAML) - if err != nil { - framework.Fail(err.Error()) - } - - ds := readDaemonSetV1OrDie(data) - dp := &v1.Pod{ - ObjectMeta: metav1.ObjectMeta{ - Name: SampleDevicePluginName, - }, - Spec: ds.Spec.Template.Spec, - } - for i := range dp.Spec.Containers[0].Env { - if dp.Spec.Containers[0].Env[i].Name == SampleDeviceEnvVarNamePluginSockDir { - dp.Spec.Containers[0].Env[i].Value = pluginSockDir - } - } - - return dp -} - // getSRIOVDevicePluginImage returns the image of SRIOV device plugin. func getSRIOVDevicePluginImage() (string, error) { data, err := e2etestfiles.Read(SRIOVDevicePluginDSYAML)