Repository: kubernetes/minikube
Pull request #16186 (2023-03-29 17:32:18)

CI: Always require Docker to be running
Some tests use `docker pull` which will require Docker to be running, so make sure Docker is running even if we aren't testing the docker driver.



Patch:
diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1
index 787e26341..4d61a2985 100644
--- a/hack/jenkins/common.ps1
+++ b/hack/jenkins/common.ps1
@@ -51,29 +51,17 @@ gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
 gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/windows_integration_setup.ps1 out/
 gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/windows_integration_teardown.ps1 out/
 
-# check for Docker CLI
-docker --help
-if ($lastexitcode -gt 0) {
-        echo "Docker CLI not found, exiting."
-        $json = "{`"state`": `"failure`", `"description`": `"Jenkins: Docker CLI not found`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/$env:JOB_NAME.txt`", `"context`": `"$env:JOB_NAME`"}"
-        Write-GithubStatus -JsonBody $json
+# Make sure Docker is up and running
+gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/setup_docker_desktop_windows.ps1 out/
+./out/setup_docker_desktop_windows.ps1
+If ($lastexitcode -gt 0) {
+	echo "Docker failed to start, exiting."
+	$json = "{`"state`": `"failure`", `"description`": `"Jenkins: docker failed to start`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/$env:JOB_NAME.txt`", `"context`": `"$env:JOB_NAME`"}"
+	Write-GithubStatus -JsonBody $json
 	./out/windows_integration_teardown.ps1
-        Exit $lastexitcode
-}
-
-if ($driver -eq "docker") {
-	# Make sure Docker is up and running
-	gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/setup_docker_desktop_windows.ps1 out/
-	./out/setup_docker_desktop_windows.ps1
-	If ($lastexitcode -gt 0) {
-		echo "Docker failed to start, exiting."
-		$json = "{`"state`": `"failure`", `"description`": `"Jenkins: docker failed to start`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/$env:JOB_NAME.txt`", `"context`": `"$env:JOB_NAME`"}"
-		Write-GithubStatus -JsonBody $json
-		./out/windows_integration_teardown.ps1
-		Exit $lastexitcode
-	}
-	docker system prune -a --volumes -f
+	Exit $lastexitcode
 }
+docker system prune -a --volumes -f
 
 # install/update Go if required
 gsutil.cmd -m cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/installers/check_install_golang.ps1 out/
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 9d74ad602..599832ebd 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -81,7 +81,7 @@ if [ "$(uname)" = "Darwin" ]; then
     export PATH=$PATH:/opt/homebrew/bin
   fi
 
-  if [ "$DRIVER" = "docker" ] && ! bash setup_docker_desktop_macos.sh; then
+  if ! bash setup_docker_desktop_macos.sh; then
     retry_github_status "${COMMIT}" "${JOB_NAME}" "failure" "${access_token}" "${public_log_url}" "Jenkins: docker failed to start"
     exit 1
   fi
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index fcdbb02cf..9b2e127f2 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -35,7 +35,7 @@ const (
 	DefaultKubernetesVersion = "v1.26.3"
 	// NewestKubernetesVersion is the newest Kubernetes version to test against
 	// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
-	NewestKubernetesVersion = "v1.27.0-rc.0"
+	NewestKubernetesVersion = "v1.27.0-beta.0"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.16.0"
 	// NoKubernetesVersion is the version used when users does NOT want to install kubernetes
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 1c8d64f93..665504cdc 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -71,7 +71,7 @@ minikube start [flags]
       --interactive                       Allow user prompts for more information (default true)
       --iso-url strings                   Locations to fetch the minikube ISO from. The list depends on the machine architecture.
       --keep-context                      This will keep the existing kubectl context and will create a minikube context.
-      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.26.3, 'latest' for v1.27.0-rc.0). Defaults to 'stable'.
+      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.26.3, 'latest' for v1.27.0-beta.0). Defaults to 'stable'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
       --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
       --kvm-network string                The KVM default network name. (kvm2 driver only) (default "default")


Test patch:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml
index 20bb51125..be22f4ff8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml
@@ -38,7 +38,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml
index 5c198ee80..cca4c64c2 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml
@@ -38,7 +38,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "192.168.32.0/20"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml
index ae1a7429d..b70416f58 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml
@@ -38,7 +38,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml
index efa13c149..38252f045 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml
@@ -44,7 +44,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml
index b3ac73289..2f87badc9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml
@@ -38,7 +38,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml
index 446215ae6..b2c0b31c5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml
@@ -38,7 +38,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml
index 11532aa4d..aa2f554c9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml
@@ -38,7 +38,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: minikube.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml
index 011b30fd6..0f6116e15 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml
@@ -39,7 +39,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml
index 2b76cf847..5cddf85b5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml
@@ -41,7 +41,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.27.0-rc.0
+kubernetesVersion: v1.27.0-beta.0
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"