diff --git a/test/e2e_node/device_plugin_test.go b/test/e2e_node/device_plugin_test.go index 9d3ece3a92f..fd700af1b00 100644 --- a/test/e2e_node/device_plugin_test.go +++ b/test/e2e_node/device_plugin_test.go @@ -25,6 +25,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles" admissionapi "k8s.io/pod-security-admission/api" @@ -77,26 +78,6 @@ func numberOfSampleResources(node *v1.Node) int64 { return val.Value() } -// getSampleDevicePluginPod returns the Device Plugin pod for sample resources in e2e tests. -func getSampleDevicePluginPod() *v1.Pod { - data, err := e2etestfiles.Read(SampleDevicePluginDSYAML) - if err != nil { - framework.Fail(err.Error()) - } - - ds := readDaemonSetV1OrDie(data) - p := &v1.Pod{ - ObjectMeta: metav1.ObjectMeta{ - Name: sampleDevicePluginName, - Namespace: metav1.NamespaceSystem, - }, - - Spec: ds.Spec.Template.Spec, - } - - return p -} - // readDaemonSetV1OrDie reads daemonset object from bytes. Panics on error. func readDaemonSetV1OrDie(objBytes []byte) *appsv1.DaemonSet { appsv1.AddToScheme(appsScheme) @@ -116,6 +97,8 @@ func testDevicePlugin(f *framework.Framework, pluginSockDir string) { var devicePluginPod, dptemplate *v1.Pod ginkgo.BeforeEach(func() { + e2eskipper.Skipf("Device Plugin tests are currently broken and being investigated") + ginkgo.By("Wait for node to be ready") gomega.Eventually(func() bool { nodes, err := e2enode.TotalReady(f.ClientSet) @@ -124,8 +107,19 @@ func testDevicePlugin(f *framework.Framework, pluginSockDir string) { }, time.Minute, time.Second).Should(gomega.BeTrue()) ginkgo.By("Scheduling a sample device plugin pod") - dp := getSampleDevicePluginPod() - dp.Namespace = "" + 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 == envVarNamePluginSockDir { dp.Spec.Containers[0].Env[i].Value = pluginSockDir