Repository: kubernetes/minikube
Pull request #13197 (2021-12-19 06:04:03)

Update Japanese translation (LINE 351-401)
/hold for japanese developer's review
/assign @t-inu
/cc @atoato88 @s-kawamura-w664


Patch:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10a24350f..8f484df43 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
           echo workspace $GITHUB_WORKSPACE
           echo "end of debug stuff"
           echo $(which jq)
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: minikube_binaries
           path: out
diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml
index 17e97aa5e..60e84ae90 100644
--- a/.github/workflows/functional_verified.yml
+++ b/.github/workflows/functional_verified.yml
@@ -43,7 +43,7 @@ jobs:
           sudo apt-get install -y libvirt-dev
           MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs
           cp -r test/integration/testdata ./out
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: minikube_binaries
           path: out
@@ -162,7 +162,7 @@ jobs:
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_docker_ubuntu_arm64
           path: minikube_binaries/report
@@ -204,7 +204,7 @@ jobs:
         run: |
           mkdir -p all_reports
           cp -r ./functional_docker_ubuntu_arm64 ./all_reports/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: all_reports
           path: all_reports
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index cd76973dc..15e50b039 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -41,7 +41,7 @@ jobs:
           echo workspace $GITHUB_WORKSPACE
           echo "end of debug stuff"
           echo $(which jq)
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: minikube_binaries
           path: out
@@ -164,7 +164,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_docker_ubuntu
           path: minikube_binaries/report
@@ -263,7 +263,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_docker_containerd_ubuntu
           path: minikube_binaries/report
@@ -365,7 +365,7 @@ jobs:
         echo 'STAT<<EOF' >> $GITHUB_ENV
         echo "${STAT}" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v1
       with:
         name: functional_podman_ubuntu
         path: minikube_binaries/report
@@ -464,7 +464,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_virtualbox_macos
           path: minikube_binaries/report
@@ -558,7 +558,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: none_ubuntu18_04
           path: minikube_binaries/report
@@ -606,7 +606,7 @@ jobs:
           cp -r ./functional_virtualbox_macos ./all_reports/
           cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: all_reports
           path: all_reports
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5a67bd148..59148d945 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -39,7 +39,7 @@ jobs:
           echo workspace $GITHUB_WORKSPACE
           echo "end of debug stuff"
           echo $(which jq)
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: minikube_binaries
           path: out
@@ -162,7 +162,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_docker_ubuntu
           path: minikube_binaries/report
@@ -262,7 +262,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_docker_containerd_ubuntu
           path: minikube_binaries/report
@@ -365,7 +365,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_podman_ubuntu
           path: minikube_binaries/report
@@ -465,7 +465,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: functional_virtualbox_macos
           path: minikube_binaries/report
@@ -560,7 +560,7 @@ jobs:
           echo 'STAT<<EOF' >> $GITHUB_ENV
           echo "${STAT}" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: none_ubuntu18_04
           path: minikube_binaries/report
@@ -608,7 +608,7 @@ jobs:
           cp -r ./functional_virtualbox_macos ./all_reports/
           cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v1
         with:
           name: all_reports
           path: all_reports
diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml
index fb352e216..c908e86f0 100644
--- a/.github/workflows/time-to-k8s-public-chart.yml
+++ b/.github/workflows/time-to-k8s-public-chart.yml
@@ -36,12 +36,6 @@ jobs:
       AWS_DEFAULT_REGION: 'us-west-1'
     steps:
       - uses: actions/checkout@v2
-      - name: Install kubectl
-        shell: bash
-        run: |
-          curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl
-          sudo install kubectl /usr/local/bin/kubectl
-          kubectl version --client=true
       - uses: actions/setup-go@v2
         with:
           go-version: ${{env.GO_VERSION}}
diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml
index d1df8f98d..e6a152114 100644
--- a/.github/workflows/update-k8s-versions.yml
+++ b/.github/workflows/update-k8s-versions.yml
@@ -19,9 +19,7 @@ jobs:
       - name: Bump Kuberenetes Versions
         id: bumpk8s
         run: |
-          t=$(make update-kubernetes-version)
-          t=$(echo $t | head -n 1)
-          echo "::set-output name=title::$t"
+          make update-kubernetes-version
           c=$(git status --porcelain)
           c="${c//$'\n'/'%0A'}"
           c="${c//$'\r'/'%0D'}"
@@ -38,12 +36,13 @@ jobs:
           push-to-fork: minikube-bot/minikube
           base: master
           delete-branch: true
-          title: "${{ steps.bumpk8s.outputs.title }}"
+          title: 'bump default/newest kubernetes versions'
           labels: ok-to-test
           body: |
             This PR was auto-generated by `make update-kubernetes-version` using [update-k8s-versions.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows) CI Workflow. 
             Please only merge if all the tests pass.
-
+            
             ```
             ${{ steps.bumpk8s.outputs.changes }}
             ```
+
diff --git a/Makefile b/Makefile
index dc4011e6a..1ac243466 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.24.0-1640194376-13123
+ISO_VERSION ?= v1.24.0-1639505700-12892
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 DEB_REVISION ?= 0
@@ -978,7 +978,7 @@ update-golang-version:
 
 .PHONY: update-kubernetes-version
 update-kubernetes-version:
-	@(cd hack/update/kubernetes_version && \
+	(cd hack/update/kubernetes_version && \
 	 go run update_kubernetes_version.go)
 
 .PHONY: update-golint-version
@@ -986,10 +986,6 @@ update-golint-version:
 	(cd hack/update/golint_version && \
 	 go run update_golint_version.go)
 
-.PHONY: update-preload-version
-update-preload-version:
-	(cd hack/update/preload_version && \
-	 go run update_preload_version.go)
 
 .PHONY: update-kubernetes-version-pr
 update-kubernetes-version-pr:
diff --git a/cmd/minikube/cmd/version.go b/cmd/minikube/cmd/version.go
index fef929f7f..ce73d4804 100644
--- a/cmd/minikube/cmd/version.go
+++ b/cmd/minikube/cmd/version.go
@@ -54,17 +54,16 @@ var versionCmd = &cobra.Command{
 			co := mustload.Running(ClusterFlagValue())
 			runner := co.CP.Runner
 			versionCMDS := map[string]*exec.Cmd{
-				"docker":      exec.Command("docker", "--version"),
-				"dockerd":     exec.Command("dockerd", "--version"),
-				"cri-dockerd": exec.Command("cri-dockerd", "--version"),
-				"containerd":  exec.Command("containerd", "--version"),
-				"crio":        exec.Command("crio", "--version"),
-				"podman":      exec.Command("sudo", "podman", "--version"),
-				"crictl":      exec.Command("sudo", "crictl", "--version"),
-				"buildctl":    exec.Command("buildctl", "--version"),
-				"ctr":         exec.Command("ctr", "--version"),
-				"runc":        exec.Command("runc", "--version"),
-				"crun":        exec.Command("crun", "--version"),
+				"docker":     exec.Command("docker", "--version"),
+				"dockerd":    exec.Command("dockerd", "--version"),
+				"containerd": exec.Command("containerd", "--version"),
+				"crio":       exec.Command("crio", "--version"),
+				"podman":     exec.Command("sudo", "podman", "--version"),
+				"crictl":     exec.Command("sudo", "crictl", "--version"),
+				"buildctl":   exec.Command("buildctl", "--version"),
+				"ctr":        exec.Command("ctr", "--version"),
+				"runc":       exec.Command("runc", "--version"),
+				"crun":       exec.Command("crun", "--version"),
 			}
 			for k, v := range versionCMDS {
 				rr, err := runner.RunCmd(v)
diff --git a/deploy/addons/ingress/ingress-deploy.yaml.tmpl b/deploy/addons/ingress/ingress-deploy.yaml.tmpl
index 46ceac8bf..784100cc1 100644
--- a/deploy/addons/ingress/ingress-deploy.yaml.tmpl
+++ b/deploy/addons/ingress/ingress-deploy.yaml.tmpl
@@ -299,7 +299,7 @@ metadata:
   namespace: ingress-nginx
 spec:
   type: NodePort
-  {{- if and (eq .IngressAPIVersion "v1") (not .PreOneTwentyKubernetes)}}
+  {{- if eq .IngressAPIVersion "v1"}}
   ipFamilyPolicy: SingleStack
   ipFamilies:
     - IPv4
diff --git a/deploy/iso/minikube-iso/Dockerfile b/deploy/iso/minikube-iso/Dockerfile
index 1068e0f6f..21906ca2b 100644
--- a/deploy/iso/minikube-iso/Dockerfile
+++ b/deploy/iso/minikube-iso/Dockerfile
@@ -36,7 +36,6 @@ RUN apt-get update \
 		dumb-init \
 		golang-go \
 		libpcre3-dev \
-		mkisofs \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/genimage.cfg b/deploy/iso/minikube-iso/board/iso/x86_64/genimage.cfg
deleted file mode 100644
index 0411d3cf4..000000000
--- a/deploy/iso/minikube-iso/board/iso/x86_64/genimage.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-image efiboot.img {
-  vfat {
-    label = "EFIBOOTISO"
-    file startup.nsh {
-      image = "efi-part/startup.nsh"
-    }
-    file EFI {
-      image = "efi-part/EFI"
-    }
-  }
-  size = 1474560
-}
diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg b/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg
deleted file mode 100644
index 92730a973..000000000
--- a/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-insmod iso9660
-insmod udf
-
-search --no-floppy --label EFIBOOTISO --set root
diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg b/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg
deleted file mode 100644
index ba43e7ca2..000000000
--- a/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-  linux /boot/vmlinuz console=tty0 rw
-  initrd /boot/initrd.img
-}
diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/post-build.sh b/deploy/iso/minikube-iso/board/iso/x86_64/post-build.sh
deleted file mode 100755
index 38ce764f9..000000000
--- a/deploy/iso/minikube-iso/board/iso/x86_64/post-build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright 2021 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-BOARD_DIR=$(dirname "$0")
-
-cp -f "$BOARD_DIR/grub.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg"
diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh
deleted file mode 100755
index b3b21c330..000000000
--- a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Copyright 2021 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-GENIMAGE_CFG="$2"
-
-support/scripts/genimage.sh -c "$GENIMAGE_CFG"
-
-cd "$BINARIES_DIR"
-mkdir -p root/boot
-cp bzImage root/boot/vmlinuz
-cp rootfs.cpio.gz root/boot/initrd.img
-mkdir -p root/EFI/BOOT
-cp efi-part/EFI/BOOT/* root/EFI/BOOT/
-cp efiboot.img root/EFI/BOOT/
-
-mkisofs \
-   -o boot.iso \
-   -R -J -v -d -N \
-   -hide-rr-moved \
-   -no-emul-boot \
-   -eltorito-platform=efi \
-   -eltorito-boot EFI/BOOT/efiboot.img \
-   -V "EFIBOOTISO" \
-   -A "EFI Boot ISO" \
-   root
-cd -
diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig
index a0ba93c8a..9cd682c72 100644
--- a/deploy/iso/minikube-iso/configs/minikube_defconfig
+++ b/deploy/iso/minikube-iso/configs/minikube_defconfig
@@ -1,51 +1,10 @@
-# Architecture
 BR2_x86_64=y
-
-# Toolchain
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
-# System
-BR2_SYSTEM_DHCP="eth0"
-
-# Required tools to create bootable media
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Bootloader
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_X86_64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/grub-stub.cfg"
-BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
-
-# Filesystem / image
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_CPIO_GZIP=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/genimage.cfg"
-
-# Linux headers same as kernel, a 4.19 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202"
-BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-
 BR2_CCACHE=y
-
-# Packages
-BR2_PACKAGE_ACPID=y
-
-# Minikube
-
 BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patches"
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_GCC_ENABLE_LTO=y
 BR2_TARGET_GENERIC_HOSTNAME="minikube"
@@ -54,8 +13,12 @@ BR2_TARGET_GENERIC_PASSWD_SHA512=y
 BR2_INIT_SYSTEMD=y
 BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/permissions"
 BR2_SYSTEM_BIN_SH_BASH=y
+# BR2_TARGET_GENERIC_GETTY is not set
 BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/users"
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/rootfs-overlay"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux_defconfig"
 BR2_LINUX_KERNEL_LZ4=y
@@ -102,6 +65,7 @@ BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
 BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
 BR2_PACKAGE_UTIL_LINUX_NSENTER=y
 BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg"
 BR2_TARGET_SYSLINUX=y
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash
index 23ec573fc..afd06990e 100644
--- a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash
+++ b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash
@@ -11,3 +11,4 @@ sha256 bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018 v1.4.3.t
 sha256 ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1 v1.4.4.tar.gz
 sha256 285a3f4c00a87538bd7d0a82a0a8a758458c02b925349f44f3189f480c326038 v1.4.6.tar.gz
 sha256 3bb9f54be022067847f5930d21ebbfe4e7a67f589d78930aa0ac713492c28bcc v1.4.9.tar.gz
+sha256 0890f7b0ee8e20a279a617c60686874b3c7a99e064adb2b38d884499b5284c43 v1.5.8.tar.gz
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
index 31f483c2e..500953ae7 100644
--- a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
+++ b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
@@ -3,8 +3,8 @@
 # containerd
 #
 ################################################################################
-CONTAINERD_BIN_VERSION = v1.4.9
-CONTAINERD_BIN_COMMIT = e25210fe30a0a703442421b0f60afac609f950a3
+CONTAINERD_BIN_VERSION = v1.5.8
+CONTAINERD_BIN_COMMIT = 1e5ef943eb76627a6d3b6de8cd1ef6537f393a71
 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
 CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
 CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme
diff --git a/hack/jenkins/build_iso.sh b/hack/jenkins/build_iso.sh
index 5a9561699..792281e40 100755
--- a/hack/jenkins/build_iso.sh
+++ b/hack/jenkins/build_iso.sh
@@ -43,25 +43,16 @@ else
 	export ISO_BUCKET
 fi
 
-if [ "$release" = false ]; then
-	# Build a new ISO for the PR
-	make release-iso | tee iso-logs.txt
-	# Abort with error message if above command failed
-	ec=$?
-	if [ $ec -gt 0 ]; then
-		if [ "$release" = false ]; then
-			gh pr comment ${ghprbPullId} --body "Hi ${ghprbPullAuthorLoginMention}, building a new ISO failed.  
-			See the logs at: https://storage.cloud.google.com/minikube-builds/logs/${ghprbPullId}/${ghprbActualCommit::7}/iso_build.txt
-			"
-		fi
-		exit $ec
+make release-iso | tee iso-logs.txt
+# Abort with error message if above command failed
+ec=$?
+if [ $ec -gt 0 ]; then
+	if [ "$release" = false ]; then
+		gh pr comment ${ghprbPullId} --body "Hi ${ghprbPullAuthorLoginMention}, building a new ISO failed.  
+		See the logs at: https://storage.cloud.google.com/minikube-builds/logs/${ghprbPullId}/${ghprbActualCommit::7}/iso_build.txt
+		"
 	fi
-else
-	# Copy the most recently built PR ISO for release
-	CURRENT_ISO_VERSION=$(egrep "ISO_VERSION \?=" Makefile | cut -d " " -f 3)
-	CURRENT_ISO_BUCKET=$(egrep "isoBucket :=" pkg/minikube/download/iso.go | cut -d " " -f 3 | cut -d '"' -f 2)
-	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}.iso gs://${ISO_BUCKET}/minikube-${ISO_VERSION}.iso
-	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}.iso.sha256 gs://${ISO_BUCKET}/minikube-${ISO_VERSION}.iso.sha256
+	exit $ec
 fi
 
 git config user.name "minikube-bot"
diff --git a/hack/update/kubernetes_version/update_kubernetes_version.go b/hack/update/kubernetes_version/update_kubernetes_version.go
index 7eeef23a6..e85e0c0e7 100644
--- a/hack/update/kubernetes_version/update_kubernetes_version.go
+++ b/hack/update/kubernetes_version/update_kubernetes_version.go
@@ -28,7 +28,6 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"golang.org/x/mod/semver"
@@ -138,9 +137,7 @@ func main() {
 		klog.Fatalf("Unable to get Kubernetes versions: %v", err)
 	}
 	data := Data{StableVersion: stable, LatestVersion: latest, LatestVersionMM: latestMM, LatestVersionP0: latestP0}
-
-	// Print PR title for Github action.
-	fmt.Printf("Bump Kubernetes version default: %s and latest: %s\n", data.StableVersion, data.LatestVersion)
+	klog.Infof("Kubernetes versions: 'stable' is %s and 'latest' is %s", data.StableVersion, data.LatestVersion)
 
 	update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue)
 }
diff --git a/hack/update/preload_version/update_preload_version.go b/hack/update/preload_version/update_preload_version.go
deleted file mode 100644
index 2867a74a9..000000000
--- a/hack/update/preload_version/update_preload_version.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright 2021 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Script expects the following env variables:
- - UPDATE_TARGET=<string>: optional - if unset/absent, default option is "fs"; valid options are:
-   - "fs"  - update only local filesystem repo files [default]
-   - "gh"  - update only remote GitHub repo files and create PR (if one does not exist already)
-   - "all" - update local and remote repo files and create PR (if one does not exist already)
- - GITHUB_TOKEN=<string>: GitHub [personal] access token
-   - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all"
-*/
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"time"
-
-	"k8s.io/klog/v2"
-	"k8s.io/minikube/hack/update"
-)
-
-const (
-	preloadFile      = "pkg/minikube/download/preload.go"
-	preloadVersionRE = `v[0-9]*`
-)
-
-var (
-	schema = map[string]update.Item{
-		preloadFile: {
-			Replace: map[string]string{
-				`PreloadVersion = "v[0-9]*"`: `PreloadVersion = "v{{.UpdateVersion}}"`,
-			},
-		},
-	}
-
-	// prBranchPrefix is the PR branch prefix; will be appended with the first 7 characters of the PR commit SHA.
-	prBranchPrefix = "update-preload-version_"
-	prTitle        = `update preload version: {update: "{{.UpdateVersion}}"}`
-)
-
-// Data holds updated preload version.
-type Data struct {
-	UpdateVersion string `json:"updateVersion"`
-}
-
-func main() {
-	const cxTimeout = 300 * time.Second
-	ctx, cancel := context.WithTimeout(context.Background(), cxTimeout)
-	defer cancel()
-
-	// Get current preload version.
-	vCurrent, err := getPreloadVersion()
-	if err != nil {
-		klog.Fatalf("failed to get current preload version: %v", err)
-	}
-	if vCurrent == 0 {
-		klog.Fatalf("cannot determine current preload version")
-	}
-	klog.Infof("current preload version: %d", vCurrent)
-
-	// Update preload version.
-	updatedVersion := vCurrent + 1
-
-	data := Data{UpdateVersion: fmt.Sprint(updatedVersion)}
-	klog.Infof("updated preload version: %s", data.UpdateVersion)
-
-	update.Apply(ctx, schema, data, prBranchPrefix, prTitle, -1)
-}
-
-// getPreloadVersion returns current preload version and any error.
-func getPreloadVersion() (int, error) {
-	blob, err := os.ReadFile(filepath.Join(update.FSRoot, preloadFile))
-	if err != nil {
-		return 0, err
-	}
-	// Match PreloadVersion.
-	re := regexp.MustCompile(fmt.Sprintf(`PreloadVersion = "%s"`, preloadVersionRE))
-	version := re.FindSubmatch(blob)
-	if version == nil {
-		return 0, nil
-	}
-	// Match version within PreloadVersion.
-	re = regexp.MustCompile(preloadVersionRE)
-	version = re.FindSubmatch(version[0])
-	if version == nil {
-		return 0, nil
-	}
-	// Convert to integer, drop 'v'.
-	current, err := strconv.Atoi(string(version[0])[1:])
-	if err != nil {
-		return 0, err
-	}
-	return current, nil
-}
diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
index 94016ab2e..80779a6cd 100644
--- a/pkg/addons/addons.go
+++ b/pkg/addons/addons.go
@@ -224,7 +224,7 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 		out.WarningT("At least needs control plane nodes to enable addon")
 	}
 
-	data := assets.GenerateTemplateData(addon, cc.KubernetesConfig, networkInfo, images, customRegistries, enable)
+	data := assets.GenerateTemplateData(addon, cc.KubernetesConfig, networkInfo, images, customRegistries)
 	return enableOrDisableAddonInternal(cc, addon, runner, data, enable)
 }
 
diff --git a/pkg/drivers/hyperkit/driver.go b/pkg/drivers/hyperkit/driver.go
index d00ba6588..e9e6566c2 100644
--- a/pkg/drivers/hyperkit/driver.go
+++ b/pkg/drivers/hyperkit/driver.go
@@ -426,7 +426,7 @@ func (d *Driver) extractKernel(isoPath string) error {
 	}{
 		{"/boot/bzimage", "bzimage"},
 		{"/boot/initrd", "initrd"},
-		{"/grub/grub.cfg", "grub.cfg"},
+		{"/isolinux/isolinux.cfg", "isolinux.cfg"},
 	} {
 		fullDestPath := d.ResolveStorePath(f.destPath)
 		if err := ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil {
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index d1195234b..62d96d1a9 100755
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -239,7 +239,7 @@ var Addons = map[string]*Addon{
 			"0640"),
 	}, false, "ingress", "", map[string]string{
 		// https://github.com/kubernetes/ingress-nginx/blob/14f6b32032b709d3e0f614ca85954c3583c5fe3d/deploy/static/provider/kind/deploy.yaml#L330
-		"IngressController": "ingress-nginx/controller:v1.1.0@sha256:f766669fdcf3dc26347ed273a55e754b427eb4411ee075a53f30718b4499076a",
+		"IngressController": "ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef",
 		// https://github.com/kubernetes/ingress-nginx/blob/14f6b32032b709d3e0f614ca85954c3583c5fe3d/deploy/static/provider/kind/deploy.yaml#L620
 		"KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
 		// https://github.com/kubernetes/ingress-nginx/blob/14f6b32032b709d3e0f614ca85954c3583c5fe3d/deploy/static/provider/kind/deploy.yaml#L670
@@ -312,7 +312,7 @@ var Addons = map[string]*Addon{
 	}, false, "olm", "third-party (operator framework)", map[string]string{
 		"OLM": "operator-framework/olm@sha256:e74b2ac57963c7f3ba19122a8c31c9f2a0deb3c0c5cac9e5323ccffd0ca198ed",
 		// operator-framework/community-operators was deprecated: https://github.com/operator-framework/community-operators#repository-is-obsolete; switching to OperatorHub.io instead
-		"UpstreamCommunityOperators": "operatorhubio/catalog@sha256:e08a1cd21fe72dd1be92be738b4bf1515298206dac5479c17a4b3ed119e30bd4",
+		"UpstreamCommunityOperators": "operatorhubio/catalog:latest@sha256:53fad78977d83dde0c27b3183c2acc25ec153ae466e1b3c9a7efb517691b77b7",
 	}, map[string]string{
 		"OLM":                        "quay.io",
 		"UpstreamCommunityOperators": "quay.io",
@@ -538,7 +538,7 @@ var Addons = map[string]*Addon{
 			"0640"),
 	}, false, "gcp-auth", "google", map[string]string{
 		"KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
-		"GCPAuthWebhook":     "k8s-minikube/gcp-auth-webhook:v0.0.8@sha256:26c7b2454f1c946d7c80839251d939606620f37c2f275be2796c1ffd96c438f6",
+		"GCPAuthWebhook":     "k8s-minikube/gcp-auth-webhook:v0.0.7@sha256:be9661afbd47e4042bee1cb48cae858cc2f4b4e121340ee69fdc0013aeffcca4",
 	}, map[string]string{
 		"GCPAuthWebhook": "gcr.io",
 	}),
@@ -781,7 +781,7 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus
 }
 
 // GenerateTemplateData generates template data for template assets
-func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo NetworkInfo, images, customRegistries map[string]string, enable bool) interface{} {
+func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo NetworkInfo, images, customRegistries map[string]string) interface{} {
 
 	a := runtime.GOARCH
 	// Some legacy docker images still need the -arch suffix
@@ -792,33 +792,31 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net
 	}
 
 	opts := struct {
-		PreOneTwentyKubernetes bool
-		Arch                   string
-		ExoticArch             string
-		ImageRepository        string
-		LoadBalancerStartIP    string
-		LoadBalancerEndIP      string
-		CustomIngressCert      string
-		IngressAPIVersion      string
-		ContainerRuntime       string
-		Images                 map[string]string
-		Registries             map[string]string
-		CustomRegistries       map[string]string
-		NetworkInfo            map[string]string
+		Arch                string
+		ExoticArch          string
+		ImageRepository     string
+		LoadBalancerStartIP string
+		LoadBalancerEndIP   string
+		CustomIngressCert   string
+		IngressAPIVersion   string
+		ContainerRuntime    string
+		Images              map[string]string
+		Registries          map[string]string
+		CustomRegistries    map[string]string
+		NetworkInfo         map[string]string
 	}{
-		PreOneTwentyKubernetes: false,
-		Arch:                   a,
-		ExoticArch:             ea,
-		ImageRepository:        cfg.ImageRepository,
-		LoadBalancerStartIP:    cfg.LoadBalancerStartIP,
-		LoadBalancerEndIP:      cfg.LoadBalancerEndIP,
-		CustomIngressCert:      cfg.CustomIngressCert,
-		IngressAPIVersion:      "v1", // api version for ingress (eg, "v1beta1"; defaults to "v1" for k8s 1.19+)
-		ContainerRuntime:       cfg.ContainerRuntime,
-		Images:                 images,
-		Registries:             addon.Registries,
-		CustomRegistries:       customRegistries,
-		NetworkInfo:            make(map[string]string),
+		Arch:                a,
+		ExoticArch:          ea,
+		ImageRepository:     cfg.ImageRepository,
+		LoadBalancerStartIP: cfg.LoadBalancerStartIP,
+		LoadBalancerEndIP:   cfg.LoadBalancerEndIP,
+		CustomIngressCert:   cfg.CustomIngressCert,
+		IngressAPIVersion:   "v1", // api version for ingress (eg, "v1beta1"; defaults to "v1" for k8s 1.19+)
+		ContainerRuntime:    cfg.ContainerRuntime,
+		Images:              images,
+		Registries:          addon.Registries,
+		CustomRegistries:    customRegistries,
+		NetworkInfo:         make(map[string]string),
 	}
 	if opts.ImageRepository != "" && !strings.HasSuffix(opts.ImageRepository, "/") {
 		opts.ImageRepository += "/"
@@ -836,9 +834,6 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net
 	if semver.MustParseRange("<1.19.0")(v) {
 		opts.IngressAPIVersion = "v1beta1"
 	}
-	if semver.MustParseRange("<1.20.0")(v) {
-		opts.PreOneTwentyKubernetes = true
-	}
 
 	// Network info for generating template
 	opts.NetworkInfo["ControlPlaneNodeIP"] = netInfo.ControlPlaneNodeIP
@@ -862,25 +857,23 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net
 			opts.Registries[name] = "" // Avoid nil access when rendering
 		}
 
-		if enable {
-			if override, ok := opts.CustomRegistries[name]; ok {
-				out.Infof("Using image {{.registry}}{{.image}}", out.V{
-					"registry": override,
-					// removing the SHA from UI
-					// SHA example gcr.io/k8s-minikube/gcp-auth-webhook:v0.0.4@sha256:65e9e69022aa7b0eb1e390e1916e3bf67f75ae5c25987f9154ef3b0e8ab8528b
-					"image": strings.Split(image, "@")[0],
-				})
-			} else if opts.ImageRepository != "" {
-				out.Infof("Using image {{.registry}}{{.image}} (global image repository)", out.V{
-					"registry": opts.ImageRepository,
-					"image":    image,
-				})
-			} else {
-				out.Infof("Using image {{.registry}}{{.image}}", out.V{
-					"registry": opts.Registries[name],
-					"image":    strings.Split(image, "@")[0],
-				})
-			}
+		if override, ok := opts.CustomRegistries[name]; ok {
+			out.Infof("Using image {{.registry}}{{.image}}", out.V{
+				"registry": override,
+				// removing the SHA from UI
+				// SHA example gcr.io/k8s-minikube/gcp-auth-webhook:v0.0.4@sha256:65e9e69022aa7b0eb1e390e1916e3bf67f75ae5c25987f9154ef3b0e8ab8528b
+				"image": strings.Split(image, "@")[0],
+			})
+		} else if opts.ImageRepository != "" {
+			out.Infof("Using image {{.registry}}{{.image}} (global image repository)", out.V{
+				"registry": opts.ImageRepository,
+				"image":    image,
+			})
+		} else {
+			out.Infof("Using image {{.registry}}{{.image}}", out.V{
+				"registry": opts.Registries[name],
+				"image":    strings.Split(image, "@")[0],
+			})
 		}
 	}
 	return opts
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 029abf495..e377cf97f 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -34,10 +34,10 @@ var (
 const (
 	// DefaultKubernetesVersion is the default Kubernetes version
 	// dont update till #10545 is solved
-	DefaultKubernetesVersion = "v1.23.1"
+	DefaultKubernetesVersion = "v1.22.4"
 	// 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.23.2-rc.0"
+	NewestKubernetesVersion = "v1.23.0-rc.1"
 	// 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/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
index 7f3d93413..26557061d 100644
--- a/pkg/minikube/download/iso.go
+++ b/pkg/minikube/download/iso.go
@@ -40,7 +40,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/13123"
+	isoBucket := "minikube-builds/iso/12892"
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
 		fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),
diff --git a/pkg/minikube/logs/logs.go b/pkg/minikube/logs/logs.go
index 13593766c..4db98ea07 100644
--- a/pkg/minikube/logs/logs.go
+++ b/pkg/minikube/logs/logs.go
@@ -174,8 +174,6 @@ func Output(r cruntime.Manager, bs bootstrapper.Bootstrapper, cfg config.Cluster
 
 	out.SetOutFile(logOutput)
 	defer out.SetOutFile(os.Stdout)
-	out.SetErrFile(logOutput)
-	defer out.SetErrFile(os.Stderr)
 
 	sort.Strings(names)
 	failed := []string{}
@@ -250,8 +248,6 @@ func outputLastStart() error {
 func OutputOffline(lines int, logOutput *os.File) {
 	out.SetOutFile(logOutput)
 	defer out.SetOutFile(os.Stdout)
-	out.SetErrFile(logOutput)
-	defer out.SetErrFile(os.Stderr)
 	if err := outputAudit(lines); err != nil {
 		klog.Errorf("failed to output audit logs: %v", err)
 	}
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
index 5fd239438..9946942c6 100644
--- a/pkg/minikube/node/config.go
+++ b/pkg/minikube/node/config.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
@@ -56,7 +55,7 @@ func configureMounts(wg *sync.WaitGroup, cc config.ClusterConfig) {
 	wg.Add(1)
 	defer wg.Done()
 
-	if !cc.Mount || driver.IsKIC(cc.Driver) {
+	if !cc.Mount {
 		return
 	}
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index a611767d7..3ed1f7861 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -90,13 +90,11 @@ type Starter struct {
 
 // Start spins up a guest and starts the Kubernetes node.
 func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
-	var wg sync.WaitGroup
-	stopk8s, err := handleNoKubernetes(starter)
+	stop8ks, err := handleNoKubernetes(starter)
 	if err != nil {
 		return nil, err
 	}
-	if stopk8s {
-		configureMounts(&wg, *starter.Cfg)
+	if stop8ks {
 		return nil, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
 	}
 
@@ -148,7 +146,10 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
 		}
 	}
 
-	go configureMounts(&wg, *starter.Cfg)
+	var wg sync.WaitGroup
+	if !driver.IsKIC(starter.Cfg.Driver) {
+		go configureMounts(&wg, *starter.Cfg)
+	}
 
 	wg.Add(1)
 	go func() {
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 69ab42317..4844c7488 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -66,9 +66,9 @@ minikube start [flags]
       --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
       --install-addons                    If set, install addons. Defaults to true. (default true)
       --interactive                       Allow user prompts for more information (default true)
-      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13123/minikube-v1.24.0-1640194376-13123.iso,https://github.com/kubernetes/minikube/releases/download/v1.24.0-1640194376-13123/minikube-v1.24.0-1640194376-13123.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.24.0-1640194376-13123.iso])
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/12892/minikube-v1.24.0-1639505700-12892.iso,https://github.com/kubernetes/minikube/releases/download/v1.24.0-1639505700-12892/minikube-v1.24.0-1639505700-12892.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.24.0-1639505700-12892.iso])
       --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.23.1, 'latest' for v1.23.2-rc.0). Defaults to 'stable'.
+      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.22.4, 'latest' for v1.23.0-rc.1). 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")
diff --git a/translations/es.json b/translations/es.json
index 8129b549f..4d3c3a41b 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -8,7 +8,7 @@
 	"'none' driver does not support 'minikube mount' command": "El driver 'none' no soporta el comando 'minikube mount'.",
 	"'none' driver does not support 'minikube podman-env' command": "El controlador 'none' no soporta el comando 'minikube podman-env'.",
 	"'none' driver does not support 'minikube ssh' command": "El controlador 'none' no soporta el comando 'minikube ssh'.",
-	"'none' driver does not support 'minikube ssh-host' command": "El controlador 'none' no soporta el comando 'minikube ssh-host'",
+	"'none' driver does not support 'minikube ssh-host' command": "",
 	"- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube docker-env\" to point your docker-cli to the docker inside minikube.\n- \"minikube image\" to build images without docker.": "",
 	"- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube image\" to build images without docker.": "",
 	"- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube podman-env\" to point your podman-cli to the podman inside minikube.\n- \"minikube image\" to build images without docker.": "",
@@ -19,9 +19,9 @@
 	"- Prune unused {{.driver_name}} images, volumes, networks and abandoned containers.\n\n\t\t\t\t{{.driver_name}} system prune --volumes": "- Recorta las imágenes, volumenes, redes y contenedores abandonados de {{.driver_name}}.\n\n\t\t\t\t{{.driver_name}} system prune --volumes",
 	"- Restart your {{.driver_name}} service": "- Reinicia el servicio {{.driver_name}}",
 	"- {{.logPath}}": "",
-	"--container-runtime must be set to \\\"containerd\\\" or \\\"cri-o\\\" for rootless": "--container-runtime debe ser configurado a \\\"containerd\\\" o \\\"crio-o\\\" para no usar usuario root",
-	"--kvm-numa-count range is 1-8": "--kvm-numa-count el rango es 1-8",
-	"--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "el flag --network es válido solamente con docker/podman y KVM, será ignorado",
+	"--container-runtime must be set to \\\"containerd\\\" or \\\"cri-o\\\" for rootless": "",
+	"--kvm-numa-count range is 1-8": "",
+	"--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "",
 	"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube delete{{.profile}}\n\t\t  minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t  \n\t\t  minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "",
 	"1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "",
 	"1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "",
@@ -42,10 +42,10 @@
 	"A set of key=value pairs that describe feature gates for alpha/experimental features.": "Un conjunto de pares clave=valor que indican si las funciones experimentales o en versión alfa deben estar o no habilitadas.",
 	"Access the Kubernetes dashboard running within the minikube cluster": "Acceder al panel de Kubernetes que corre dentro del cluster minikube",
 	"Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "",
-	"Add SSH identity key to SSH authentication agent": "Agregar llave SSH al agente de autenticacion SSH",
+	"Add SSH identity key to SSH authentication agent": "",
 	"Add an image to local cache.": "Agregar una imagen al caché local",
-	"Add host key to SSH known_hosts file": "Agregar la llave del host al fichero known_hosts",
-	"Add image to cache for all running minikube clusters": "Agregar la imagen al cache para todos los cluster de minikube activos",
+	"Add host key to SSH known_hosts file": "",
+	"Add image to cache for all running minikube clusters": "",
 	"Add machine IP to NO_PROXY environment variable": "Agregar una IP de máquina a la variable de entorno NO_PROXY",
 	"Add, delete, or push a local image into minikube": "Agrega, elimina, o empuja una imagen local dentro de minikube, haciendo (add, delete, push) respectivamente.",
 	"Add, remove, or list additional nodes": "Usa (add, remove, list) para agregar, eliminar o listar nodos adicionales.",
@@ -60,23 +60,23 @@
 	"All existing scheduled stops cancelled": "",
 	"Allow user prompts for more information": "Permitir que el usuario solicite más información",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Repositorio de imágenes alternativo del que extraer imágenes de Docker. Puedes usarlo cuando tengas acceso limitado a gcr.io. Si quieres que minikube elija uno por ti, solo tienes que definir el valor como \"auto\". Los usuarios de China continental pueden utilizar réplicas locales de gcr.io, como registry.cn-hangzhou.aliyuncs.com/google_containers",
-	"Alternatively you could install one of these drivers:": "Alternativamente, puede installar uno de estos drivers:",
+	"Alternatively you could install one of these drivers:": "",
 	"Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "Cantidad de RAM asignada a la VM de minikube (formato: \u003cnúmero\u003e[\u003cunidad\u003e], donde unidad = b, k, m o g)",
 	"Amount of time to wait for a service in seconds": "Cantidad de tiempo para esperar por un servicio en segundos",
 	"Amount of time to wait for service in seconds": "Cantidad de tiempo para esperar un servicio en segundos",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "Otro hipervisor, por ejemplo VirtualBox, está en conflicto con KVM. Por favor detén el otro hipervisor, o usa --driver para cambiarlo.",
-	"Another minikube instance is downloading dependencies... ": "Otra instancia de minikube esta descargando dependencias...",
+	"Another minikube instance is downloading dependencies... ": "",
 	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "Otro programa está usando un archivo requerido por minikube. Si estas usando Hyper-V, intenta detener la máquina virtual de minikube desde el administrador de Hyper-V",
-	"At least needs control plane nodes to enable addon": "Al menos se necesita un nodo de plano de control para habilitar el addon",
+	"At least needs control plane nodes to enable addon": "",
 	"Automatically selected the {{.driver}} driver": "Controlador {{.driver}} seleccionado automáticamente",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Controlador {{.driver}} seleccionado automáticamente. Otras opciones: {{.alternates}}",
 	"Available Commands": "Comandos disponibles",
 	"Basic Commands:": "Comandos basicos:",
 	"Because you are using a Docker driver on {{.operating_system}}, the terminal needs to be open to run it.": "Porque estás usando controlador Docker en {{.operating_system}}, la terminal debe abrirse para ejecutarlo.",
 	"Bind Address: {{.Address}}": "Dirección de enlace: {{.Address}}",
-	"Booting up control plane ...": "Iniciando plano de control",
+	"Booting up control plane ...": "",
 	"Both driver={{.driver}} and vm-driver={{.vmd}} have been set.\n\n    Since vm-driver is deprecated, minikube will default to driver={{.driver}}.\n\n    If vm-driver is set in the global config, please run \"minikube config unset vm-driver\" to resolve this warning.\n\t\t\t": "Ambos driver={{.driver}} y vm-driver={{.vmd}} han sido establecidos.\n\n vm-driver ya es obsoleto, el por defecto de minikube será driver={{.driver}}.\n\n Si vm-driver está establecido en la configuracion global, ejecuta \"minikube config unset vm-driver\" para resolver esta advertencia.\n\t\t\t",
-	"Bridge CNI is incompatible with multi-node clusters, use a different CNI": "El CNI Bridge no es compatible con clusters multi-nodo, use un CNI diferente",
+	"Bridge CNI is incompatible with multi-node clusters, use a different CNI": "",
 	"Build a container image in minikube": "",
 	"Build a container image, using the container runtime.": "",
 	"Build image on all nodes.": "",
@@ -107,7 +107,7 @@
 	"Configure environment to use minikube's Docker daemon": "Configura un entorno para usar el Docker daemon de minikube",
 	"Configure environment to use minikube's Podman service": "Configura un entorno para usar el servicio Podman de minikube",
 	"Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "Configura los complementos dentro de minikube con ADDON_NAME (Por ejemplo: minikube addons configure registry-creds). Para ver los complementos disponibles usa: minikube addons list",
-	"Configuring RBAC rules ...": "Configurando reglas RBAC...",
+	"Configuring RBAC rules ...": "",
 	"Configuring local host environment ...": "Configuranto entorno del host local ...",
 	"Configuring {{.name}} (Container Networking Interface) ...": "Configurando CNI {{.name}} ...",
 	"Confirm that you have a working internet connection and that your VM has not run out of resources by using: 'minikube logs'": "Confirma que su conexión a internet funciona y que su VM no se quedó sin recursos con: 'minikube logs'",
@@ -117,13 +117,13 @@
 	"Consider increasing Docker Desktop's memory size.": "Considera incrementar la memoria asignada a Docker Desktop",
 	"Continuously listing/getting the status with optional interval duration.": "",
 	"Control Plane could not update, try minikube delete --all --purge": "",
-	"Copy the specified file into minikube": "Copie el fichero dentro de minikube",
+	"Copy the specified file into minikube": "",
 	"Copy the specified file into minikube, it will be saved at path \u003ctarget file absolute path\u003e in your minikube.\nDefault target node controlplane and If \u003csource node name\u003e is omitted, It will trying to copy from host.\n\nExample Command : \"minikube cp a.txt /home/docker/b.txt\" +\n                  \"minikube cp a.txt minikube-m02:/home/docker/b.txt\"\n                  \"minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt\"": "",
 	"Could not determine a Google Cloud project, which might be ok.": "No se pudo determinar un proyecto de Google Cloud que podría estar bien.",
 	"Could not find any GCP credentials. Either run `gcloud auth application-default login` or set the GOOGLE_APPLICATION_CREDENTIALS environment variable to the path of your credentials file.": "No se puedo encontrar ninguna credencial de GCP. Corre `gcloud auth application-default login` o establezca la variable de entorno GOOGLE_APPLICATION_CREDENTIALS en la ruta de su archivo de credentiales.",
 	"Could not process error from failed deletion": "No se pudo procesar el error de la eliminación fallida",
 	"Could not process errors from failed deletion": "No se pudieron procesar los errores de la eliminación fallida",
-	"Could not resolve IP address": "No se puede resolver la dirección IP",
+	"Could not resolve IP address": "",
 	"Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "Código de país de la réplica de imagen que quieras utilizar. Déjalo en blanco para usar el valor global. Los usuarios de China continental deben definirlo como cn.",
 	"Creating mount {{.name}} ...": "Montando {{.name}}...",
 	"Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB) ...": "Creando {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB) ...",
@@ -198,8 +198,8 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "Garantiza de que los usuarios listados en /etc/libvirt/qemu.conf tienen acceso a tu carpeta home",
 	"Ensure that you are a member of the appropriate libvirt group (remember to relogin for group changes to take effect!)": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "Garantiza de que tú valor para HTTPS_PROXY apunte a un proxy HTTPS en lugar de uno HTTP",
-	"Ensure the tmp directory path is writable to the current user.": "Asegúrese que el usuario actual puede escribir en el direcotorio tmp",
-	"Ensure you have at least 20GB of free disk space.": "Asegúrese de tener por lo menos 20GB libres en el disco",
+	"Ensure the tmp directory path is writable to the current user.": "",
+	"Ensure you have at least 20GB of free disk space.": "",
 	"Ensure your {{.driver_name}} is running and is healthy.": "Garantiza que {{.driver_name}} está corriendo y está saludable.",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Variables de entorno que se transferirán al daemon de Docker. Formato: clave=valor",
 	"Environment variables to pass to the build. (format: key=value)": "",
@@ -226,25 +226,25 @@
 	"Error opening service": "No se ha podido abrir el servicio",
 	"Error parsing Driver version: {{.error}}": "No se ha podido analizar la versión de Driver: {{.error}}",
 	"Error parsing minikube version: {{.error}}": "No se ha podido analizar la versión de minikube: {{.error}}",
-	"Error parsing {{.name}}={{.value}}, {{.err}}": "No se ha podido analizar {{.name}}={{.value}},{{.err}}",
-	"Error reading {{.path}}: {{.error}}": "Error leyendo {{.path}}: {{.error}}",
+	"Error parsing {{.name}}={{.value}}, {{.err}}": "",
+	"Error reading {{.path}}: {{.error}}": "",
 	"Error starting cluster": "No se ha podido iniciar el clúster",
 	"Error starting mount": "No se ha podido iniciar el montaje",
 	"Error while setting kubectl current context :  {{.error}}": "Error mientras se configuraba el contexto actual de kubectl: {{.error}}",
 	"Error while setting kubectl current context:  {{.error}}": "Error mientras se configuraba el contexto actual de kubectl: {{.error}}",
-	"Error with ssh-add": "Error al ejecutar ssh-add",
+	"Error with ssh-add": "",
 	"Error writing mount pid": "No se ha podido escribir el pid de montaje",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "Error: Has seleccionado Kubernetes {{.new}}, pero el clúster de tu perfil utiliza la versión {{.old}}. No se puede cambiar a una versión inferior sin eliminar todos los datos y recursos pertinentes, pero dispones de las siguientes opciones para continuar con la operación:\n* Volver a crear el clúster con Kubernetes {{.new}}: ejecuta \"minikube delete {{.profile}}\" y, luego, \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Crear un segundo clúster con Kubernetes {{.new}}: ejecuta \"minikube start -p \u003cnuevo nombre\u003e --kubernetes-version={{.new}}\"\n* Reutilizar el clúster actual con Kubernetes {{.old}} o una versión posterior: ejecuta \"minikube start {{.profile}} --kubernetes-version={{.old}}",
-	"Examples": "Ejemplos",
+	"Examples": "",
 	"Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "",
-	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "El disco existente no tiene nuevas características ({{.error}}). Para actualizar, ejecute 'minikube delete'",
+	"Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "",
 	"Exiting": "Saliendo",
-	"Exiting due to {{.fatal_code}}: {{.fatal_msg}}": "Saliendo por un error {{.fatal_code}}: {{.fatal_msg}}",
+	"Exiting due to {{.fatal_code}}: {{.fatal_msg}}": "",
 	"Exposed port of the proxyfied dashboard. Set to 0 to pick a random port.": "",
 	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
 	"Fail check if container paused": "",
 	"Failed runtime": "",
-	"Failed to build image": "No se pudo construir la imagen",
+	"Failed to build image": "",
 	"Failed to cache and load images": "",
 	"Failed to cache binaries": "",
 	"Failed to cache images": "",
@@ -253,13 +253,13 @@
 	"Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "No se han podido cambiar los permisos de {{.minikube_dir_path}}: {{.error}}",
 	"Failed to check main repository and mirrors for images": "",
 	"Failed to configure metallb IP {{.profile}}": "",
-	"Failed to create file": "No se pudo crear el fichero",
+	"Failed to create file": "",
 	"Failed to create runtime": "",
 	"Failed to delete cluster {{.name}}, proceeding with retry anyway.": "",
 	"Failed to delete cluster {{.name}}.": "",
 	"Failed to delete cluster: {{.error}}": "No se ha podido eliminar el clúster: {{.error}}",
 	"Failed to delete cluster: {{.error}}__1": "No se ha podido eliminar el clúster: {{.error}}",
-	"Failed to delete images": "No se pudo borrar las imagenes",
+	"Failed to delete images": "",
 	"Failed to delete images from config": "",
 	"Failed to enable container runtime": "",
 	"Failed to get bootstrapper": "",
@@ -268,30 +268,30 @@
 	"Failed to get service URL: {{.error}}": "",
 	"Failed to get temp": "",
 	"Failed to kill mount process: {{.error}}": "No se ha podido detener el proceso de activación: {{.error}}",
-	"Failed to list cached images": "No se pudo listar las imágenes en cache",
-	"Failed to list images": "No se pudieron listar las imagenes",
-	"Failed to load image": "No se pudo cargar la imagen",
+	"Failed to list cached images": "",
+	"Failed to list images": "",
+	"Failed to load image": "",
 	"Failed to persist images": "",
-	"Failed to pull image": "No se pudo enviar la imágen",
-	"Failed to pull images": "No se pudieron obtener imágenes",
-	"Failed to push images": "No se pudieron enviar las imágenes",
+	"Failed to pull image": "",
+	"Failed to pull images": "",
+	"Failed to push images": "",
 	"Failed to read temp": "",
 	"Failed to reload cached images": "",
-	"Failed to remove image": "No se pudo eliminar la imagen",
+	"Failed to remove image": "",
 	"Failed to remove images for profile {{.pName}} {{.error}}": "",
 	"Failed to save config {{.profile}}": "",
 	"Failed to save dir": "",
-	"Failed to save image": "No se pudo guardar la imágen",
+	"Failed to save image": "",
 	"Failed to save stdin": "",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "No se ha podido definir la variable de entorno NO_PROXY. Utiliza export NO_PROXY=$NO_PROXY,{{.ip}}",
 	"Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "",
-	"Failed to setup certs": "No se pudieron configurar los certificados",
+	"Failed to setup certs": "",
 	"Failed to start container runtime": "",
 	"Failed to start {{.driver}} {{.driver_type}}. Running \"{{.cmd}}\" may fix it: {{.error}}": "",
 	"Failed to stop node {{.name}}": "",
 	"Failed to tag images": "",
-	"Failed to update cluster": "No se pudo actualizar el cluster",
-	"Failed to update config": "No se puedo actualizar la configuración",
+	"Failed to update cluster": "",
+	"Failed to update config": "",
 	"Failed unmount: {{.error}}": "",
 	"Filter to use only VM Drivers": "",
 	"Flags": "",
@@ -309,15 +309,15 @@
 	"Found docker, but the docker service isn't running. Try restarting the docker service.": "",
 	"Found driver(s) but none were healthy. See above for suggestions how to fix installed drivers.": "",
 	"Found network options:": "Se han encontrado las siguientes opciones de red:",
-	"Found {{.number}} invalid profile(s) ! ": "Se encontraron {{.number}} perfil(es) invalido(s)",
+	"Found {{.number}} invalid profile(s) ! ": "",
 	"Generate command completion for a shell": "",
 	"Generate command completion for bash.": "",
 	"Generate command completion for fish .": "",
 	"Generate command completion for zsh.": "",
 	"Generate unable to parse disk size '{{.diskSize}}': {{.error}}": "",
 	"Generate unable to parse memory '{{.memory}}': {{.error}}": "",
-	"Generating certificates and keys ...": "Generando certificados y llaves",
-	"Get or list the current profiles (clusters)": "Obtener o listar los perfiles actuales (clusters)",
+	"Generating certificates and keys ...": "",
+	"Get or list the current profiles (clusters)": "",
 	"Gets the logs of the running instance, used for debugging minikube, not user code.": "",
 	"Gets the status of a local Kubernetes cluster": "",
 	"Gets the status of a local Kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and Kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for Kubernetes NOK)": "",
@@ -974,10 +974,10 @@
 	"using metrics-server addon, heapster is deprecated": "",
 	"version json failure": "",
 	"version yaml failure": "",
-	"zsh completion failed": "Falló el autocompletado de zsh",
-	"zsh completion.": "autocompletado zsh",
-	"{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: Sugerencia: {{ .suggestion}}",
-	"{{ .name }}: {{ .rejection }}": "{{ .name }}: {{ .rejection }}",
+	"zsh completion failed": "",
+	"zsh completion.": "",
+	"{{ .name }}: Suggestion: {{ .suggestion}}": "",
+	"{{ .name }}: {{ .rejection }}": "",
 	"{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "",
 	"{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "",
 	"{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "",
diff --git a/translations/fr.json b/translations/fr.json
index a662a116c..5f77425bb 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -22,7 +22,7 @@
 	"--kvm-numa-count range is 1-8": "la tranche de --kvm-numa-count est 1 à 8",
 	"--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "le drapeau --network est valide uniquement avec les pilotes docker/podman et KVM, il va être ignoré",
 	"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube delete {{.profile}}\n\t\t  minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t  \n\t\t  minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t  \n\t\t  minikube delete {{.profile}}\n\t\t  minikube start {{.profile}} - -kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t2)  Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t  \n  \t\t  minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t3)  Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t  \n\t\t  minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t",
-	"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube delete{{.profile}}\n\t\t  minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t  \n\t\t  minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t",
+	"1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube delete{{.profile}}\n\t\t  minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t  \n\t\t  minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t  \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t  \n\t\t  minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "",
 	"1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"",
 	"1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"Memory\" à {{.recommend}} ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"",
 	"1. Open the \"Docker Desktop\" menu by clicking the Docker icon in the system tray\n\t\t2. Click \"Settings\"\n\t\t3. Click \"Resources\"\n\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t5. Click \"Apply \u0026 Restart\"": "1. Ouvrez le menu \"Docker Desktop\" en cliquant sur l'icône Docker dans la barre d'état système\n\t\t2. Cliquez sur \"Settings\"\n\t\t3. Cliquez sur \"Ressources\"\n\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t5. Cliquez sur \"Apply \u0026 Restart\"",
@@ -58,7 +58,7 @@
 	"All existing scheduled stops cancelled": "Tous les arrêts programmés existants annulés",
 	"Allow user prompts for more information": "Autoriser les utilisateurs à saisir plus d'informations",
 	"Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Autre dépôt d'images d'où extraire des images Docker. Il peut être utilisé en cas d'accès limité à gcr.io. Définissez-le sur \\\"auto\\\" pour permettre à minikube de choisir la valeur à votre place. Pour les utilisateurs situés en Chine continentale, vous pouvez utiliser des miroirs gcr.io locaux tels que registry.cn-hangzhou.aliyuncs.com/google_containers.",
-	"Alternatively you could install one of these drivers:": "Vous pouvez également installer l'un de ces pilotes :",
+	"Alternatively you could install one of these drivers:": "",
 	"Amount of time to wait for a service in seconds": "Temps d'attente pour un service en secondes",
 	"Amount of time to wait for service in seconds": "Temps d'attente pour un service en secondes",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "Un autre hyperviseur, tel que VirtualBox, est en conflit avec KVM. Veuillez arrêter l'autre hyperviseur ou utiliser --driver pour y basculer.",
@@ -697,7 +697,7 @@
 	"Troubleshooting Commands:": "Commandes de dépannage :",
 	"Try 'minikube delete' to force new SSL certificates to be installed": "Essayez 'minikube delete' pour forcer l'installation de nouveaux certificats SSL",
 	"Try 'minikube delete', and disable any conflicting VPN or firewall software": "Essayez 'minikube delete' et désactivez tout logiciel VPN ou pare-feu en conflit",
-	"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"docker system prune\" pour supprimer les données Docker inutilisées (éventuellement avec \"-a\")\n\t\t\t2. Augmentez le stockage alloué à Docker for Desktop en cliquant sur :\n\t\t\t\tIcône Docker \u003e Settings \u003e Ressources \u003e Disk Image Size\n\t\t\t3. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker",
+	"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "",
 	"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Settings \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"docker system prune\" pour supprimer les données Docker inutilisées (éventuellement avec \"-a\")\n\t\t\t2. Augmentez le stockage alloué à Docker for Desktop en cliquant sur :\n\t\t\t\tIcône Docker \u003e Préférences \u003e Ressources \u003e Taille de l'image disque\n\t\t\t3. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker",
 	"Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"sudo podman system prune\" to remove unused podman data\n\t\t\t2. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"sudo podman system prune\" pour supprimer les données podman inutilisées\n\t\t\t2. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker",
 	"Trying to delete invalid profile {{.profile}}": "Tentative de suppression du profil non valide {{.profile}}",
diff --git a/translations/ja.json b/translations/ja.json
index 57a1a0dfc..4ae6f9352 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -348,57 +348,54 @@
 	"Ignoring unknown custom image {{.name}}": "",
 	"Ignoring unknown custom registry {{.name}}": "",
 	"Images Commands:": "イメージ用コマンド:",
-	"Images used by this addon. Separated by commas.": "",
-	"In order to use the fall back image, you need to log in to the github packages registry": "",
-	"Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.": "",
-	"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "Docker デーモンに渡す Docker レジストリが安全ではありません。デフォルトのサービス CIDR 範囲が自動的に追加されます",
-	"Install VirtualBox and ensure it is in the path, or select an alternative value for --driver": "",
-	"Install the latest hyperkit binary, and run 'minikube delete'": "",
-	"Invalid port": "",
-	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
-	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "",
-	"It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "",
-	"Kill the mount process spawned by minikube start": "",
-	"Kubelet network plug-in to use (default: auto)": "",
-	"Kubernetes requires at least 2 CPU's to start": "",
-	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "",
-	"Kubernetes {{.version}} is not supported by this release of minikube": "",
-	"Kubernetes: Stopping ...": "",
+	"Images used by this addon. Separated by commas.": "このアドオンで使用するイメージ。複数の場合、カンマで区切ります。",
+	"In order to use the fall back image, you need to log in to the github packages registry": "予備イメージを使用するために、GitHub のパッケージレジストリーにログインする必要があります",
+	"Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.": "Docker デーモンに渡す安全でない Docker レジストリー。デフォルトのサービス CIDR 範囲が自動的に追加されます。",
+	"Install VirtualBox and ensure it is in the path, or select an alternative value for --driver": "VritualBox をインストールして、VirtualBox がパス中にあることを確認するか、--driver に別の値を指定してください",
+	"Install the latest hyperkit binary, and run 'minikube delete'": "最新の hyperkit バイナリーをインストールして、'minikube delete' を実行してください",
+	"Invalid port": "無効なポート",
+	"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "Istio は {{.minCPUs}} 個の CPU を必要とします -- あなたの設定では {{.cpus}} 個の CPU しか割り当てていません",
+	"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio は {{.minMem}}MB のメモリーを必要とします -- あなたの設定では、{{.memory}}MB しか割り当てていません",
+	"It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "GCE 上で実行しているようですが、これは GCP Auth アドオンなしに認証が機能すべきであることになります。それでもクレデンシャルファイルを使用した認証を希望するのであれば、--force フラグを使用してください。",
+	"Kill the mount process spawned by minikube start": "minikube start によって実行されたマウントプロセスを強制停止します",
+	"Kubelet network plug-in to use (default: auto)": "使用する Kubelet ネットワークプラグイン (既定値: auto)",
+	"Kubernetes requires at least 2 CPU's to start": "Kubernetes は起動に少なくとも 2 個の CPU が必要です",
+	"Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} が利用可能です。アップグレードしたい場合、--kubernetes-version={{.prefix}}{{.new}} を指定してください",
+	"Kubernetes {{.version}} is not supported by this release of minikube": "この minikube リリースは Kubernetes {{.version}} をサポートしていません",
+	"Kubernetes: Stopping ...": "Kubernetes: 停止しています...",
 	"Kubernetes: {{.status}}": "",
 	"Launching Kubernetes ...": "Kubernetes を起動しています...",
-	"Launching proxy ...": "プロキシを起動しています...",
-	"List all available images from the local cache.": "",
-	"List existing minikube nodes.": "",
-	"List image names the addon w/ADDON_NAME used. For a list of available addons use: minikube addons list": "",
-	"List images": "",
-	"List nodes.": "",
-	"List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)": "ホストでソケットとして公開する必要のあるゲスト VSock ポートのリスト（hyperkit ドライバのみ）",
-	"List of ports that should be exposed (docker and podman driver only)": "",
-	"Listening to 0.0.0.0 on external docker host {{.host}}. Please be advised": "",
-	"Listening to {{.listenAddr}}. This is not recommended and can cause a security vulnerability. Use at your own risk": "",
-	"Lists all available minikube addons as well as their current statuses (enabled/disabled)": "",
-	"Lists all minikube profiles.": "すべてのminikubeのプロフィールを一覧で表示します",
-	"Lists all valid default values for PROPERTY_NAME": "",
-	"Lists all valid minikube profiles and detects all possible invalid profiles.": "",
-	"Lists the URLs for the services in your local cluster": "",
-	"Load a image into minikube": "",
-	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "NFS マウントを介してゲストと共有するローカル フォルダ（hyperkit ドライバのみ）",
-	"Local proxy ignored: not passing {{.name}}={{.value}} to docker env.": "",
-	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "ネットワーキングに使用する VPNKit ソケットのロケーション。空の場合、Hyperkit VPNKitSock が無効になり、「auto」の場合、Mac VPNKit 接続に Docker が使用され、それ以外の場合、指定された VSock が使用されます（hyperkit ドライバのみ）",
-	"Location of the minikube iso": "minikube iso のロケーション",
-	"Locations to fetch the minikube ISO from.": "",
-	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "",
-	"Log into the minikube environment (for debugging)": "minikube の環境にログインします(デバッグ用)",
-	"Manage images": "",
+	"Launching proxy ...": "プロキシーを起動しています...",
+	"List all available images from the local cache.": "ローカルキャッシュから利用可能な全イメージを一覧表示します。",
+	"List existing minikube nodes.": "既存の minikube ノードを一覧表示します。",
+	"List image names the addon w/ADDON_NAME used. For a list of available addons use: minikube addons list": "ADDON_NAME アドオンが使用しているイメージ名を一覧表示します。利用可能なアドオンの一覧表示は、次のコマンドを実行してください: minikube addons list",
+	"List images": "イメージを一覧表示します",
+	"List nodes.": "ノードを一覧表示します。",
+	"List of guest VSock ports that should be exposed as sockets on the host (hyperkit driver only)": "ホスト上でソケットとして公開する必要のあるゲスト VSock ポートの一覧 (hyperkit ドライバーのみ)",
+	"List of ports that should be exposed (docker and podman driver only)": "公開する必要のあるポートの一覧 (docker、podman ドライバーのみ)",
+	"Listening to 0.0.0.0 on external docker host {{.host}}. Please be advised": "外部 Docker ホスト {{.host}} 上で 0.0.0.0 をリッスンしています。ご承知おきください",
+	"Listening to {{.listenAddr}}. This is not recommended and can cause a security vulnerability. Use at your own risk": "{{.listenAddr}} をリッスンしています。これは推奨されず、セキュリティー脆弱性になる可能性があります。自己責任で使用してください",
+	"Lists all available minikube addons as well as their current statuses (enabled/disabled)": "利用可能な minikube アドオンとその現在の状態 (有効 / 無効) を一覧表示します。",
+	"Lists all minikube profiles.": "minikube プロファイルを一覧表示します。",
+	"Lists all valid default values for PROPERTY_NAME": "PROPERTY_NAME 用の有効な minikube プロファイルを一覧表示します",
+	"Lists all valid minikube profiles and detects all possible invalid profiles.": "有効な minikube プロファイルを一覧表示し、無効の可能性のあるプロファイルを全て検知します",
+	"Lists the URLs for the services in your local cluster": "ローカルクラスターのサービス用 URL を一覧表示します",
+	"Load a image into minikube": "minikube にイメージを読み込ませます",
+	"Local folders to share with Guest via NFS mounts (hyperkit driver only)": "NFS マウントを介してゲストと共有するローカルフォルダー (hyperkit ドライバーのみ)",
+	"Local proxy ignored: not passing {{.name}}={{.value}} to docker env.": "ローカルプロキシーは無視されました: docker env に {{.name}}={{.value}} は渡されません。",
+	"Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "ネットワーキングに使用する VPNKit ソケットのロケーション。空の場合、Hyperkit VPNKitSock が無効になり、'auto' の場合、Docker for Mac の VPNKit 接続が使用され、それ以外の場合、指定された VSock が使用されます (hyperkit ドライバーのみ)",
+	"Location of the minikube iso": "minikube iso の場所",
+	"Locations to fetch the minikube ISO from.": "minikube ISO の取得元",
+	"Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": 	"SSH を使ってマシンにログインしたりコマンドを実行します ('docker-machine ssh' と同様です)。",
+	"Log into the minikube environment (for debugging)": "minikube の環境にログインします (デバッグ用)",
+	"Manage images": "イメージを管理します",
 	"Message Size: {{.size}}": "メッセージのサイズ: {{.size}}",
-	"Modify minikube config": "minikube の設定を修正しています",
-	"Modify minikube's kubernetes addons": "minikube の Kubernetes アドオンを修正しています",
 	"Modify persistent configuration values": "永続的な設定値を変更します",
-	"More information: https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities": "",
-	"Most users should use the newer 'docker' driver instead, which does not require root!": "",
+	"More information: https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities": "追加情報: https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities",
+	"Most users should use the newer 'docker' driver instead, which does not require root!": "多くのユーザーはより新しい 'docker' ドライバーを代わりに使用すべきです (root 権限が必要ありません!)",
 	"Mount type:   {{.name}}": "マウントタイプ:   {{.name}}",
-	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "",
-	"Mounts the specified directory into minikube": "minikube に指定されたディレクトリをマウントします",
+	"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ...": "ホストパス {{.sourcePath}} を {{.destinationPath}} として VM 中にマウントしています ...",
+	"Mounts the specified directory into minikube": "minikube に指定されたディレクトリーをマウントします",
 	"Mounts the specified directory into minikube.": "",
 	"Multiple errors deleting profiles": "プロフィールを削除中に複数のエラーが発生しました",
 	"Multiple minikube profiles were found -": "複数の minikube のプロフィールが見つかりました",


Test patch:
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml
index a26adfa22..44ba22842 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml
index 358ce92e0..4f10db858 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "192.168.32.0/20"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml
index 35aedf090..a8e5c1dbd 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio-options-gates.yaml
index 3a9b024ed..7c4cbdec8 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio-options-gates.yaml
@@ -46,7 +46,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio.yaml
index 6d7ae1490..4a7a6c4b9 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/crio.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/default.yaml
index c0d85b013..2f3c77f3d 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/default.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/dns.yaml
index f4d22f7ff..788c3c078 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/dns.yaml
@@ -40,7 +40,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: minikube.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/image-repository.yaml
index 69b154b1d..c4a63d496 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/image-repository.yaml
@@ -41,7 +41,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/options.yaml
index e677bac6f..a6624c0de 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/options.yaml
@@ -43,7 +43,7 @@ etcd:
     dataDir: /var/lib/minikube/etcd
     extraArgs:
       proxy-refresh-interval: "70000"
-kubernetesVersion: v1.23.0
+kubernetesVersion: v1.23.0-rc.1
 networking:
   dnsDomain: cluster.local
   podSubnet: "10.244.0.0/16"
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index b22b73bcc..b3983ecb5 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -293,7 +293,7 @@ func validateRegistryAddon(ctx context.Context, t *testing.T, profile string) {
 		t.Logf("pre-cleanup %s failed: %v (not a problem)", rr.Command(), err)
 	}
 
-	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=gcr.io/k8s-minikube/busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local"))
+	rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "run", "--rm", "registry-test", "--restart=Never", "--image=busybox", "-it", "--", "sh", "-c", "wget --spider -S http://registry.kube-system.svc.cluster.local"))
 	if err != nil {
 		t.Errorf("failed to hit registry.kube-system.svc.cluster.local. args %q failed: %v", rr.Command(), err)
 	}
@@ -451,22 +451,22 @@ func validateOlmAddon(ctx context.Context, t *testing.T, profile string) {
 	start := time.Now()
 
 	if _, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "wait", "--for=condition=ready", "--namespace=olm", "pod", "--selector=app=catalog-operator", "--timeout=90s")); err != nil {
-		t.Fatalf("failed waiting for pod catalog-operator: %v", err)
+		t.Fatalf("failed waititing for pod catalog-operator: %v", err)
 	}
 	t.Logf("catalog-operator stabilized in %s", time.Since(start))
 
 	if _, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "wait", "--for=condition=ready", "--namespace=olm", "pod", "--selector=app=olm-operator", "--timeout=90s")); err != nil {
-		t.Fatalf("failed waiting for pod olm-operator: %v", err)
+		t.Fatalf("failed waititing for pod olm-operator: %v", err)
 	}
 	t.Logf("olm-operator stabilized in %s", time.Since(start))
 
 	if _, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "wait", "--for=condition=ready", "--namespace=olm", "pod", "--selector=app=packageserver", "--timeout=90s")); err != nil {
-		t.Fatalf("failed waiting for pod olm-operator: %v", err)
+		t.Fatalf("failed waititing for pod olm-operator: %v", err)
 	}
 	t.Logf("packageserver stabilized in %s", time.Since(start))
 
 	if _, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "wait", "--for=condition=ready", "--namespace=olm", "pod", "--selector=olm.catalogSource=operatorhubio-catalog", "--timeout=90s")); err != nil {
-		t.Fatalf("failed waiting for pod operatorhubio-catalog: %v", err)
+		t.Fatalf("failed waititing for pod operatorhubio-catalog: %v", err)
 	}
 	t.Logf("operatorhubio-catalog stabilized in %s", time.Since(start))
 
diff --git a/test/integration/mount_start_test.go b/test/integration/mount_start_test.go
index 1a9b518d4..9c0ed82e0 100644
--- a/test/integration/mount_start_test.go
+++ b/test/integration/mount_start_test.go
@@ -26,7 +26,6 @@ import (
 	"strconv"
 	"strings"
 	"testing"
-	"time"
 )
 
 const (
@@ -94,14 +93,12 @@ func validateStartWithMount(ctx context.Context, t *testing.T, profile string) {
 	// We have to increment this because if you have two mounts with the same port, when you kill one cluster the mount will break for the other
 	mountStartPort++
 
-	args := []string{"start", "-p", profile, "--memory=2048", "--mount", "--mount-gid", mountGID, "--mount-msize", mountMSize, "--mount-port", mountPort(), "--mount-uid", mountUID, "--no-kubernetes"}
+	args := []string{"start", "-p", profile, "--memory=2048", "--mount", "--mount-gid", mountGID, "--mount-msize", mountMSize, "--mount-port", mountPort(), "--mount-uid", mountUID}
 	args = append(args, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
 		t.Fatalf("failed to start minikube with args: %q : %v", rr.Command(), err)
 	}
-	// The mount takes a split second to come up, without this the validateMount test will fail
-	time.Sleep(1 * time.Second)
 }
 
 // validateMount checks if the cluster has a folder mounted
@@ -168,6 +165,4 @@ func validateRestart(ctx context.Context, t *testing.T, profile string) {
 	if err != nil {
 		t.Fatalf("restart failed: %q : %v", rr.Command(), err)
 	}
-	// The mount takes a split second to come up, without this the validateMount test will fail
-	time.Sleep(1 * time.Second)
 }
diff --git a/test/integration/preload_test.go b/test/integration/preload_test.go
index c7734d75f..6ce94bfbc 100644
--- a/test/integration/preload_test.go
+++ b/test/integration/preload_test.go
@@ -52,7 +52,7 @@ func TestPreload(t *testing.T) {
 	}
 
 	// Now, pull the busybox image into minikube
-	image := "gcr.io/k8s-minikube/busybox"
+	image := "busybox"
 	var cmd *exec.Cmd
 	if ContainerRuntime() == "docker" {
 		cmd = exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "pull", image)
diff --git a/test/integration/testdata/build/Dockerfile b/test/integration/testdata/build/Dockerfile
index f37a113cc..dfe60cebf 100644
--- a/test/integration/testdata/build/Dockerfile
+++ b/test/integration/testdata/build/Dockerfile
@@ -1,3 +1,3 @@
-FROM gcr.io/k8s-minikube/busybox
+FROM busybox
 RUN true
 ADD content.txt /
diff --git a/test/integration/testdata/busybox-mount-test.yaml b/test/integration/testdata/busybox-mount-test.yaml
index ac14f4b71..787c0797b 100644
--- a/test/integration/testdata/busybox-mount-test.yaml
+++ b/test/integration/testdata/busybox-mount-test.yaml
@@ -9,7 +9,7 @@ spec:
   restartPolicy: Never
   containers:
     - name: mount-munger
-      image: gcr.io/k8s-minikube/busybox:1.28.4-glibc
+      image: busybox:1.28.4-glibc
       command: ["/bin/sh", "-c", "--"]
       args:
         - cat /mount-9p/created-by-test;
diff --git a/test/integration/testdata/busybox.yaml b/test/integration/testdata/busybox.yaml
index ed163828b..b057afe0b 100644
--- a/test/integration/testdata/busybox.yaml
+++ b/test/integration/testdata/busybox.yaml
@@ -6,7 +6,7 @@ metadata:
     integration-test: busybox
 spec:
   containers:
-    - image: gcr.io/k8s-minikube/busybox:1.28.4-glibc
+    - image: busybox:1.28.4-glibc
       command:
         - sleep
         - "3600"
diff --git a/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml b/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml
index c778c28d0..b0b5d1779 100644
--- a/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml
+++ b/test/integration/testdata/multinodes/multinode-pod-dns-test.yaml
@@ -20,7 +20,7 @@ spec:
         # https://github.com/docker-library/busybox/issues/48
         # note: k8s.gcr.io/e2e-test-images/agnhost:2.32
         # has similar issues (ie, resolves but returns exit code 1)
-        image: gcr.io/k8s-minikube/busybox:1.28
+        image: busybox:1.28
         command:
           - sleep
           - "3600"