Merge pull request #55737 from mindprince/update-nvidia-urls

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update URLs for nvidia gpu device plugin and nvidia driver installer. Device plugin is now an addon and its manifest is now in kubernetes/kubernetes. The manifest on GoogleCloudPlatform/container-engine-accelerators no longer contains device plugin. This is needed after https://github.com/kubernetes/kubernetes/pull/54826 and https://github.com/GoogleCloudPlatform/container-engine-accelerators/pull/25 **Release note**: ```release-note NONE ``` /sig scheduling

Merge pull request #55737 from mindprince/update-nvidia-urls
2d972c19 · Kubernetes Submit Queue · GitHub · a67abac7 · 3ac94a57 · 2d972c19
Unverified Commit 2d972c19 authored Nov 18, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

gpu_util.go test/e2e/framework/gpu_util.go +3 -3

nvidia-gpus.go test/e2e/scheduling/nvidia-gpus.go +1 -1

No files found.
--- a/test/e2e/framework/gpu_util.go
+++ b/test/e2e/framework/gpu_util.go
@@ -32,7 +32,7 @@ const (
 	// TODO: Parametrize it by making it a feature in TestFramework.
 	// so we can override the daemonset in other setups (non COS).
 	// GPUDevicePluginDSYAML is the official Google Device Plugin Daemonset NVIDIA GPU manifest for GKE
-	GPUDevicePluginDSYAML = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/device-plugin-daemonset.yaml"
+	GPUDevicePluginDSYAML = "https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml"
 )

 // TODO make this generic and not linked to COS only
@@ -61,8 +61,8 @@ func NVIDIADevicePlugin(ns string) *v1.Pod {

 		Spec: ds.Spec.Template.Spec,
 	}
-	// Remove NVIDIA drivers installation
-	p.Spec.InitContainers = []v1.Container{}
+	// Remove node affinity
+	p.Spec.Affinity = nil

 	return p
 }

--- a/test/e2e/scheduling/nvidia-gpus.go
+++ b/test/e2e/scheduling/nvidia-gpus.go
@@ -163,7 +163,7 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) {
 	framework.Logf("Cluster is running on COS. Proceeding with test")

 	if f.BaseName == "device-plugin-gpus" {
-		dsYamlUrl = framework.GPUDevicePluginDSYAML
+		dsYamlUrl = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
 		gpuResourceName = framework.NVIDIAGPUResourceName
 		podCreationFunc = makeCudaAdditionDevicePluginTestPod
 	} else {