Merge pull request #21644 from nirs/prepare-for-internal-kvm

test: fix test helper for AUX and fix SELinux build

Author: medyagh

Makefile

@@ -188,7 +188,7 @@ endef
 
 # $(call DOCKER, image, command)
 define DOCKER
-	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app:Z -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)'
+	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app:Z -v $(GOPATH):/go:Z --init $(1) /bin/bash -c '$(2)'
 endef
 
 ifeq ($(BUILD_IN_DOCKER),y)
@@ -1213,7 +1213,7 @@ update-kong-ingress-controller-version:
 update-nvidia-device-plugin-version:
 	cd hack && go run update/nvidia_device_plugin_version/nvidia_device_plugin_version.go
 
-# for amd gpu 
+# for amd gpu
 .PHONY: update-amd-device-plugin-version
 update-amd-device-plugin-version:
 	cd hack && go run update/amd_device_gpu_plugin_version/amd_device_gpu_plugin_version.go

hack/jenkins/common.sh

@@ -500,7 +500,7 @@ if [ -z "${EXTERNAL}" ]; then
   echo ">> uploading ${SUMMARY_OUT} to gs://${JOB_GCS_BUCKET}_summary.json"
   echo ">>   public URL:  ${REPORT_URL_BASE}/${JOB_GCS_BUCKET}_summary.json"
   gsutil -qm cp "${SUMMARY_OUT}" "gs://${JOB_GCS_BUCKET}_summary.json" || true
-else 
+else
   # Otherwise, put the results in a predictable spot so the upload job can find them
   REPORTS_PATH=test_reports
   mkdir -p "$REPORTS_PATH"

site/content/en/docs/tutorials/nvidia.md

@@ -46,7 +46,7 @@ date: 2018-01-02
   minikube delete
   ```
   This will make sure minikube does any required setup or addon installs now that the nvidia runtime is available.
-  
+
 - Start minikube with one of:
   - The NVIDIA Container Toolkit
     ```shell
@@ -154,7 +154,7 @@ drivers supported by minikube for macOS doesn't support GPU passthrough:
 - [moby/hyperkit#159](https://github.com/moby/hyperkit/issues/159)
 - [VirtualBox docs](https://www.virtualbox.org/manual/ch09.html#pcipassthrough)
 
-Also: 
+Also:
 
 - For quite a while, all Mac hardware (both laptops and desktops) have come with
   Intel or AMD GPUs (and not with NVIDIA GPUs). Recently, Apple added [support

test/integration/main_test.go

@@ -134,32 +134,32 @@ func Target() string {
 
 // NoneDriver returns whether or not this test is using the none driver
 func NoneDriver() bool {
-	return strings.Contains(*startArgs, "--driver=none") || strings.Contains(*startArgs, "--vm-driver=none")
+	return matchDriverFlag("none")
 }
 
 // HyperVDriver returns whether or not this test is using the Hyper-V driver
 func HyperVDriver() bool {
-	return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
+	return matchDriverFlag("hyperv")
 }
 
 // KVM returns true is is KVM driver
 func KVMDriver() bool {
-	return strings.Contains(*startArgs, "--driver=kvm") || strings.Contains(*startArgs, "--vm-driver=kvm") || strings.Contains(*startArgs, "--driver=kvm2") || strings.Contains(*startArgs, "--vm-driver=kvm2")
+	return matchDriverFlag("kvm", "kvm2")
 }
 
 // VirtualboxDriver returns whether or not this test is using the VirtualBox driver
 func VirtualboxDriver() bool {
-	return strings.Contains(*startArgs, "--driver=virtualbox") || strings.Contains(*startArgs, "--vm-driver=virtualbox")
+	return matchDriverFlag("virtualbox")
 }
 
 // DockerDriver returns whether or not this test is using the docker or podman driver
 func DockerDriver() bool {
-	return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker")
+	return matchDriverFlag("docker")
 }
 
 // PodmanDriver returns whether or not this test is using the docker or podman driver
 func PodmanDriver() bool {
-	return strings.Contains(*startArgs, "--driver=podman") || strings.Contains(*startArgs, "--vm-driver=podman")
+	return matchDriverFlag("podman")
 }
 
 // RootlessDriver returns whether or not this test is using the rootless KIC driver
@@ -172,9 +172,13 @@ func KicDriver() bool {
 	return DockerDriver() || PodmanDriver()
 }
 
+func HyperkitDriver() bool {
+	return matchDriverFlag("hyperkit")
+}
+
 // NeedsAuxDriver Returns true if the driver needs an auxiliary driver (kvm, hyperkit,..)
 func NeedsAuxDriver() bool {
-	return HyperVDriver() || KVMDriver()
+	return HyperkitDriver() || KVMDriver()
 }
 
 // VMDriver checks if the driver is a VM
@@ -228,3 +232,15 @@ func Seconds(n int) time.Duration {
 func TestingKicBaseImage() bool {
 	return strings.Contains(*startArgs, "base-image")
 }
+
+func matchDriverFlag(names ...string) bool {
+	args := *startArgs
+	for _, name := range names {
+		for _, prefix := range []string{"--driver=", "--vm-driver="} {
+			if strings.Contains(args, prefix+name) {
+				return true
+			}
+		}
+	}
+	return false
+}