Merge pull request #58782 from mindprince/override-installer-url
Automatic merge from submit-queue (batch tested with PRs 58302, 58782, 58555, 58741). 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>. Make it possible to override the driver installer daemonset url from test-infra. This will enable things like kubernetes/test-infra#6430 /kind enhancement /sig testing /sig scheduling **Release note**: ```release-note NONE ``` /assign @jiayingz @vishh
This commit is contained in:
		@@ -17,6 +17,7 @@ limitations under the License.
 | 
				
			|||||||
package scheduling
 | 
					package scheduling
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"os"
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -163,7 +164,12 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) {
 | 
				
			|||||||
	framework.Logf("Cluster is running on COS. Proceeding with test")
 | 
						framework.Logf("Cluster is running on COS. Proceeding with test")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if f.BaseName == "device-plugin-gpus" {
 | 
						if f.BaseName == "device-plugin-gpus" {
 | 
				
			||||||
		dsYamlUrl = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
 | 
							dsYamlUrlFromEnv := os.Getenv("NVIDIA_DRIVER_INSTALLER_DAEMONSET")
 | 
				
			||||||
 | 
							if dsYamlUrlFromEnv != "" {
 | 
				
			||||||
 | 
								dsYamlUrl = dsYamlUrlFromEnv
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								dsYamlUrl = "https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/master/daemonset.yaml"
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		gpuResourceName = framework.NVIDIAGPUResourceName
 | 
							gpuResourceName = framework.NVIDIAGPUResourceName
 | 
				
			||||||
		podCreationFunc = makeCudaAdditionDevicePluginTestPod
 | 
							podCreationFunc = makeCudaAdditionDevicePluginTestPod
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
@@ -172,6 +178,7 @@ func testNvidiaGPUsOnCOS(f *framework.Framework) {
 | 
				
			|||||||
		podCreationFunc = makeCudaAdditionTestPod
 | 
							podCreationFunc = makeCudaAdditionTestPod
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						framework.Logf("Using %v", dsYamlUrl)
 | 
				
			||||||
	// Creates the DaemonSet that installs Nvidia Drivers.
 | 
						// Creates the DaemonSet that installs Nvidia Drivers.
 | 
				
			||||||
	// The DaemonSet also runs nvidia device plugin for device plugin test.
 | 
						// The DaemonSet also runs nvidia device plugin for device plugin test.
 | 
				
			||||||
	ds, err := framework.DsFromManifest(dsYamlUrl)
 | 
						ds, err := framework.DsFromManifest(dsYamlUrl)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user