From e64c08f86971905560fec7761e37fcffa5a213d0 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Tue, 12 Mar 2019 12:58:23 -0700 Subject: [PATCH] remove DevicePlugin test for feature gate that can no longer be set --- test/e2e_node/device_plugin.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/e2e_node/device_plugin.go b/test/e2e_node/device_plugin.go index 138100a815..f0c7bdbe19 100644 --- a/test/e2e_node/device_plugin.go +++ b/test/e2e_node/device_plugin.go @@ -45,17 +45,12 @@ const ( ) // Serial because the test restarts Kubelet -var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePlugin][NodeFeature:DevicePlugin][Serial]", func() { - f := framework.NewDefaultFramework("device-plugin-errors") - testDevicePlugin(f, false, pluginapi.DevicePluginPath) -}) - var _ = framework.KubeDescribe("Device Plugin [Feature:DevicePluginProbe][NodeFeature:DevicePluginProbe][Serial]", func() { f := framework.NewDefaultFramework("device-plugin-errors") - testDevicePlugin(f, true, "/var/lib/kubelet/plugins_registry") + testDevicePlugin(f, "/var/lib/kubelet/plugins_registry") }) -func testDevicePlugin(f *framework.Framework, enablePluginWatcher bool, pluginSockDir string) { +func testDevicePlugin(f *framework.Framework, pluginSockDir string) { pluginSockDir = filepath.Join(pluginSockDir) + "/" Context("DevicePlugin", func() { By("Enabling support for Kubelet Plugins Watcher") @@ -63,7 +58,6 @@ func testDevicePlugin(f *framework.Framework, enablePluginWatcher bool, pluginSo if initialConfig.FeatureGates == nil { initialConfig.FeatureGates = map[string]bool{} } - initialConfig.FeatureGates[string(features.KubeletPluginsWatcher)] = enablePluginWatcher initialConfig.FeatureGates[string(features.KubeletPodResources)] = true }) It("Verifies the Kubelet device plugin functionality.", func() {