From e27d282dda510fe9638627c5a82a135b0ed93816 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Wed, 11 May 2022 16:18:32 +0000
Subject: [PATCH 01/12] bump default/newest kubernetes versions

---
 .../testdata/v1.24/containerd-api-port.yaml   | 72 +++++++++++++++++
 .../v1.24/containerd-pod-network-cidr.yaml    | 72 +++++++++++++++++
 .../bsutil/testdata/v1.24/containerd.yaml     | 72 +++++++++++++++++
 .../testdata/v1.24/crio-options-gates.yaml    | 79 +++++++++++++++++++
 .../bsutil/testdata/v1.24/crio.yaml           | 72 +++++++++++++++++
 .../bsutil/testdata/v1.24/default.yaml        | 72 +++++++++++++++++
 .../bsutil/testdata/v1.24/dns.yaml            | 72 +++++++++++++++++
 .../testdata/v1.24/image-repository.yaml      | 73 +++++++++++++++++
 .../bsutil/testdata/v1.24/options.yaml        | 76 ++++++++++++++++++
 pkg/minikube/constants/constants.go           |  4 +-
 site/content/en/docs/commands/start.md        |  2 +-
 11 files changed, 663 insertions(+), 3 deletions(-)
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
 create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
new file mode 100644
index 0000000000..c0d6a2e107
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
@@ -0,0 +1,72 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 12345
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /run/containerd/containerd.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:12345
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
new file mode 100644
index 0000000000..ad0f6e2d5f
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
@@ -0,0 +1,72 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /run/containerd/containerd.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "192.168.32.0/20"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "192.168.32.0/20"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
new file mode 100644
index 0000000000..b57437de99
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
@@ -0,0 +1,72 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /run/containerd/containerd.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
new file mode 100644
index 0000000000..c071093bf1
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
@@ -0,0 +1,79 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /var/run/crio/crio.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+    fail-no-swap: "true"
+    feature-gates: "a=b"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    feature-gates: "a=b"
+    kube-api-burst: "32"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    feature-gates: "a=b"
+    leader-elect: "false"
+    scheduler-name: "mini-scheduler"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
+mode: "iptables"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
new file mode 100644
index 0000000000..e610321bef
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
@@ -0,0 +1,72 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /var/run/crio/crio.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
new file mode 100644
index 0000000000..a7d163f7ae
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
@@ -0,0 +1,72 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /var/run/dockershim.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
new file mode 100644
index 0000000000..f304a30dd2
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
@@ -0,0 +1,72 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /var/run/dockershim.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: minikube.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "minikube.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
new file mode 100644
index 0000000000..232c8785ab
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
@@ -0,0 +1,73 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /var/run/dockershim.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+imageRepository: test/repo
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
new file mode 100644
index 0000000000..71046482a4
--- /dev/null
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
@@ -0,0 +1,76 @@
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: InitConfiguration
+localAPIEndpoint:
+  advertiseAddress: 1.1.1.1
+  bindPort: 8443
+bootstrapTokens:
+  - groups:
+      - system:bootstrappers:kubeadm:default-node-token
+    ttl: 24h0m0s
+    usages:
+      - signing
+      - authentication
+nodeRegistration:
+  criSocket: /var/run/dockershim.sock
+  name: "mk"
+  kubeletExtraArgs:
+    node-ip: 1.1.1.1
+  taints: []
+---
+apiVersion: kubeadm.k8s.io/v1beta3
+kind: ClusterConfiguration
+apiServer:
+  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
+  extraArgs:
+    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+    fail-no-swap: "true"
+controllerManager:
+  extraArgs:
+    allocate-node-cidrs: "true"
+    kube-api-burst: "32"
+    leader-elect: "false"
+scheduler:
+  extraArgs:
+    leader-elect: "false"
+    scheduler-name: "mini-scheduler"
+certificatesDir: /var/lib/minikube/certs
+clusterName: mk
+controlPlaneEndpoint: control-plane.minikube.internal:8443
+etcd:
+  local:
+    dataDir: /var/lib/minikube/etcd
+    extraArgs:
+      proxy-refresh-interval: "70000"
+kubernetesVersion: v1.24.0
+networking:
+  dnsDomain: cluster.local
+  podSubnet: "10.244.0.0/16"
+  serviceSubnet: 10.96.0.0/12
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+authentication:
+  x509:
+    clientCAFile: /var/lib/minikube/certs/ca.crt
+cgroupDriver: systemd
+clusterDomain: "cluster.local"
+# disable disk resource management by default
+imageGCHighThresholdPercent: 100
+evictionHard:
+  nodefs.available: "0%"
+  nodefs.inodesFree: "0%"
+  imagefs.available: "0%"
+failSwapOn: false
+staticPodPath: /etc/kubernetes/manifests
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+clusterCIDR: "10.244.0.0/16"
+metricsBindAddress: 0.0.0.0:10249
+conntrack:
+  maxPerCore: 0
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
+  tcpEstablishedTimeout: 0s
+# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
+  tcpCloseWaitTimeout: 0s
+mode: "iptables"
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 39d16e56d9..def00b1d89 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -33,10 +33,10 @@ var (
 const (
 	// DefaultKubernetesVersion is the default Kubernetes version
 	// dont update till #10545 is solved
-	DefaultKubernetesVersion = "v1.23.5"
+	DefaultKubernetesVersion = "v1.24.0"
 	// 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.6-rc.0"
+	NewestKubernetesVersion = "v1.24.1-rc.0"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.16.0"
 	// NoKubernetesVersion is the version used when users does NOT want to install kubernetes
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 4cd8fa3484..397e4994bf 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -71,7 +71,7 @@ minikube start [flags]
       --interactive                       Allow user prompts for more information (default true)
       --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13762/minikube-v1.25.2-1651892774-13762-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1651892774-13762/minikube-v1.25.2-1651892774-13762-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1651892774-13762-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13762/minikube-v1.25.2-1651892774-13762.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1651892774-13762/minikube-v1.25.2-1651892774-13762.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1651892774-13762.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.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'.
+      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.0, 'latest' for v1.24.1-rc.0). Defaults to 'stable'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
       --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
       --kvm-network string                The KVM default network name. (kvm2 driver only) (default "default")

From 3e0cd168b5f454319a437caa5012fd1b5c55c4d4 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Wed, 11 May 2022 16:32:02 -0700
Subject: [PATCH 02/12] add cron to cleanup go modules

---
 hack/jenkins/common.sh                        |  7 ++++++
 hack/jenkins/cron/cleanup_go_modules.sh       | 17 +++++++++++++
 hack/jenkins/install_linux_crons.sh           | 21 ++++++++++++++++
 hack/jenkins/install_osx_crons.sh             | 24 +++++++++++++++++++
 .../jenkins/linux_integration_tests_docker.sh |  3 ---
 .../linux_integration_tests_docker_arm64.sh   | 15 ++++++------
 ...nux_integration_tests_docker_containerd.sh |  5 ----
 ...tegration_tests_docker_containerd_arm64.sh | 15 ++++++------
 .../linux_integration_tests_docker_crio.sh    |  5 ----
 ...nux_integration_tests_docker_crio_arm64.sh | 15 ++++++------
 hack/jenkins/linux_integration_tests_kvm.sh   |  3 ---
 .../linux_integration_tests_kvm_containerd.sh |  5 ----
 .../linux_integration_tests_kvm_crio.sh       |  5 ----
 hack/jenkins/linux_integration_tests_none.sh  |  4 ----
 .../jenkins/linux_integration_tests_podman.sh |  3 ---
 .../linux_integration_tests_virtualbox.sh     |  3 ---
 hack/jenkins/osx_integration_tests_docker.sh  |  5 ----
 .../jenkins/osx_integration_tests_hyperkit.sh |  5 ----
 .../osx_integration_tests_virtualbox.sh       |  6 -----
 hack/jenkins/prbot.sh                         |  0
 hack/jenkins/preload_generation.sh            |  4 ++--
 hack/jenkins/upload_integration_report.sh     |  0
 22 files changed, 92 insertions(+), 78 deletions(-)
 create mode 100755 hack/jenkins/cron/cleanup_go_modules.sh
 create mode 100755 hack/jenkins/install_linux_crons.sh
 create mode 100755 hack/jenkins/install_osx_crons.sh
 mode change 100644 => 100755 hack/jenkins/linux_integration_tests_docker_arm64.sh
 mode change 100644 => 100755 hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh
 mode change 100644 => 100755 hack/jenkins/linux_integration_tests_docker_crio_arm64.sh
 mode change 100644 => 100755 hack/jenkins/prbot.sh
 mode change 100644 => 100755 hack/jenkins/preload_generation.sh
 mode change 100644 => 100755 hack/jenkins/upload_integration_report.sh

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 6a0f7c6b87..0b1e464728 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -100,6 +100,13 @@ sudo ARCH="$ARCH" ./installers/check_install_docker.sh || true
 # install gotestsum if not present
 GOROOT="/usr/local/go" ./installers/check_install_gotestsum.sh || true
 
+# install cron jobs
+if [ "$OS" == "linux" ]; then
+  source ./install_linux_crons.sh
+else
+  source ./install_osx_crons.sh
+fi
+
 # let's just clean all docker artifacts up
 docker system prune --force --volumes || true
 docker system df || true
diff --git a/hack/jenkins/cron/cleanup_go_modules.sh b/hack/jenkins/cron/cleanup_go_modules.sh
new file mode 100755
index 0000000000..38f7a07b06
--- /dev/null
+++ b/hack/jenkins/cron/cleanup_go_modules.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Copyright 2022 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.
+
+go clean -modcache
diff --git a/hack/jenkins/install_linux_crons.sh b/hack/jenkins/install_linux_crons.sh
new file mode 100755
index 0000000000..e46e985b49
--- /dev/null
+++ b/hack/jenkins/install_linux_crons.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright 2022 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
+
+mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
+sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP AND REBOOT"
+sudo install cron/cleanup_go_modules.sh /etc/cron.monthly/cleanup_go_modules || echo "FAILED TO INSTALL GO MODULES CLEANUP"
diff --git a/hack/jenkins/install_osx_crons.sh b/hack/jenkins/install_osx_crons.sh
new file mode 100755
index 0000000000..1378bf63d1
--- /dev/null
+++ b/hack/jenkins/install_osx_crons.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright 2022 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
+
+mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
+install cron/cleanup_and_reboot_Darwin.sh $HOME/cleanup_and_reboot.sh || echo "FAILED TO INSTALL CLEANUP AND REBOOT"
+echo "*/30 * * * * $HOME/cleanup_and_reboot.sh" | crontab
+install cron/cleanup_go_modules.sh $HOME/cleanup_go_modules.sh || echo "FAILED TO INSTALL GO MODULES CLEANUP"
+echo "0 0 1 * * $HOME/cleanup_go_modules.sh" | crontab
+crontab -l
diff --git a/hack/jenkins/linux_integration_tests_docker.sh b/hack/jenkins/linux_integration_tests_docker.sh
index 76d2a75268..0884cc1f97 100755
--- a/hack/jenkins/linux_integration_tests_docker.sh
+++ b/hack/jenkins/linux_integration_tests_docker.sh
@@ -31,9 +31,6 @@ DRIVER="docker"
 JOB_NAME="Docker_Linux"
 CONTAINER_RUNTIME="docker"
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 # removing possible left over docker containers from previous runs
 docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true
 
diff --git a/hack/jenkins/linux_integration_tests_docker_arm64.sh b/hack/jenkins/linux_integration_tests_docker_arm64.sh
old mode 100644
new mode 100755
index 3e37be2439..8412555f8b
--- a/hack/jenkins/linux_integration_tests_docker_arm64.sh
+++ b/hack/jenkins/linux_integration_tests_docker_arm64.sh
@@ -22,18 +22,17 @@
 # COMMIT: Actual commit ID from upstream build
 # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
 # access_token: The GitHub API access token. Injected by the Jenkins credential provider.
+
 set -e
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+ARCH="arm64"
+OS="linux"
+DRIVER="docker"
+JOB_NAME="$JOB_NAME"
+CONTAINER_RUNTIME="docker"
+EXTERNAL="yes"
 
 # removing possible left over docker containers from previous runs
 docker rm -f -v "$(docker ps -aq)" >/dev/null 2>&1 || true
 
-ARCH="arm64" \
-OS="linux" \
-DRIVER="docker" \
-JOB_NAME="$JOB_NAME" \
-CONTAINER_RUNTIME="docker" \
-EXTERNAL="yes" \
 source ./common.sh
diff --git a/hack/jenkins/linux_integration_tests_docker_containerd.sh b/hack/jenkins/linux_integration_tests_docker_containerd.sh
index a6fd8eeef6..903bfbf578 100755
--- a/hack/jenkins/linux_integration_tests_docker_containerd.sh
+++ b/hack/jenkins/linux_integration_tests_docker_containerd.sh
@@ -31,11 +31,6 @@ DRIVER="docker"
 JOB_NAME="Docker_Linux_containerd"
 CONTAINER_RUNTIME="containerd"
 
-
-
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 # removing possible left over docker containers from previous runs
 docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true
 
diff --git a/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh b/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh
old mode 100644
new mode 100755
index 6e0e505fe2..c42fa286e9
--- a/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh
+++ b/hack/jenkins/linux_integration_tests_docker_containerd_arm64.sh
@@ -22,18 +22,17 @@
 # COMMIT: Actual commit ID from upstream build
 # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
 # access_token: The GitHub API access token. Injected by the Jenkins credential provider.
+
 set -e
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+ARCH="arm64"
+OS="linux"
+DRIVER="docker"
+JOB_NAME="$JOB_NAME"
+CONTAINER_RUNTIME="containerd"
+EXTERNAL="yes"
 
 # removing possible left over docker containers from previous runs
 docker rm -f -v "$(docker ps -aq)" >/dev/null 2>&1 || true
 
-ARCH="arm64" \
-OS="linux" \
-DRIVER="docker" \
-JOB_NAME="$JOB_NAME" \
-CONTAINER_RUNTIME="containerd" \
-EXTERNAL="yes" \
 source ./common.sh
diff --git a/hack/jenkins/linux_integration_tests_docker_crio.sh b/hack/jenkins/linux_integration_tests_docker_crio.sh
index 466e62f685..a96dc9d4a6 100755
--- a/hack/jenkins/linux_integration_tests_docker_crio.sh
+++ b/hack/jenkins/linux_integration_tests_docker_crio.sh
@@ -31,11 +31,6 @@ DRIVER="docker"
 JOB_NAME="Docker_Linux_crio"
 CONTAINER_RUNTIME="crio"
 
-
-
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 # removing possible left over docker containers from previous runs
 docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true
 
diff --git a/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh b/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh
old mode 100644
new mode 100755
index eeb7b03a6d..3af937dfff
--- a/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh
+++ b/hack/jenkins/linux_integration_tests_docker_crio_arm64.sh
@@ -22,18 +22,17 @@
 # COMMIT: Actual commit ID from upstream build
 # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
 # access_token: The GitHub API access token. Injected by the Jenkins credential provider.
+
 set -e
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+ARCH="arm64"
+OS="linux"
+DRIVER="docker"
+JOB_NAME="$JOB_NAME"
+CONTAINER_RUNTIME="crio"
+EXTERNAL="yes"
 
 # removing possible left over docker containers from previous runs
 docker rm -f -v "$(docker ps -aq)" >/dev/null 2>&1 || true
 
-ARCH="arm64" \
-OS="linux" \
-DRIVER="docker" \
-JOB_NAME="$JOB_NAME" \
-CONTAINER_RUNTIME="crio" \
-EXTERNAL="yes" \
 source ./common.sh
diff --git a/hack/jenkins/linux_integration_tests_kvm.sh b/hack/jenkins/linux_integration_tests_kvm.sh
index e88b2c5b0f..ac120ca52c 100755
--- a/hack/jenkins/linux_integration_tests_kvm.sh
+++ b/hack/jenkins/linux_integration_tests_kvm.sh
@@ -34,9 +34,6 @@ EXPECTED_DEFAULT_DRIVER="kvm2"
 # We pick kvm as our gvisor testbed because it is fast & reliable
 EXTRA_TEST_ARGS="-gvisor"
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 sudo apt-get update
 sudo apt-get -y install qemu-system libvirt-clients libvirt-daemon-system ebtables iptables dnsmasq
 sudo adduser jenkins libvirt || true
diff --git a/hack/jenkins/linux_integration_tests_kvm_containerd.sh b/hack/jenkins/linux_integration_tests_kvm_containerd.sh
index 82c5c89930..253ec00584 100755
--- a/hack/jenkins/linux_integration_tests_kvm_containerd.sh
+++ b/hack/jenkins/linux_integration_tests_kvm_containerd.sh
@@ -31,11 +31,6 @@ DRIVER="kvm2"
 JOB_NAME="KVM_Linux_containerd"
 CONTAINER_RUNTIME="containerd"
 
-
-
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 sudo apt-get update
 sudo apt-get -y install qemu-system libvirt-clients libvirt-daemon-system ebtables iptables dnsmasq
 sudo adduser jenkins libvirt || true
diff --git a/hack/jenkins/linux_integration_tests_kvm_crio.sh b/hack/jenkins/linux_integration_tests_kvm_crio.sh
index 10414d1a7a..14e489b6ce 100755
--- a/hack/jenkins/linux_integration_tests_kvm_crio.sh
+++ b/hack/jenkins/linux_integration_tests_kvm_crio.sh
@@ -31,11 +31,6 @@ DRIVER="kvm2"
 JOB_NAME="KVM_Linux_crio"
 CONTAINER_RUNTIME="crio"
 
-
-
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 sudo apt-get update
 sudo apt-get -y install qemu-system libvirt-clients libvirt-daemon-system ebtables iptables dnsmasq
 sudo adduser jenkins libvirt || true
diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
index 10d5aa4d85..5f6c950705 100755
--- a/hack/jenkins/linux_integration_tests_none.sh
+++ b/hack/jenkins/linux_integration_tests_none.sh
@@ -23,7 +23,6 @@
 # EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
 # access_token: The GitHub API access token. Injected by the Jenkins credential provider.
 
-
 set -e
 
 OS="linux"
@@ -66,9 +65,6 @@ if ! which socat &>/dev/null; then
   sudo apt-get -qq -y install socat
 fi
 
-mkdir -p cron && gsutil -m rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 # We need this for reasons now
 sudo sysctl fs.protected_regular=0
 
diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh
index fd19ae9e2a..d61e712d71 100755
--- a/hack/jenkins/linux_integration_tests_podman.sh
+++ b/hack/jenkins/linux_integration_tests_podman.sh
@@ -31,9 +31,6 @@ DRIVER="podman"
 JOB_NAME="Experimental_Podman_Linux"
 CONTAINER_RUNTIME="containerd"
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 # remove possible left over podman containers
 sudo podman rm -f -v $(sudo podman ps -aq) || true
 
diff --git a/hack/jenkins/linux_integration_tests_virtualbox.sh b/hack/jenkins/linux_integration_tests_virtualbox.sh
index 0957872928..7bd5e0205f 100755
--- a/hack/jenkins/linux_integration_tests_virtualbox.sh
+++ b/hack/jenkins/linux_integration_tests_virtualbox.sh
@@ -32,7 +32,4 @@ JOB_NAME="VirtualBox_Linux"
 EXTRA_TEST_ARGS=""
 EXPECTED_DEFAULT_DRIVER="kvm2"
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
-
 source ./common.sh 2h
diff --git a/hack/jenkins/osx_integration_tests_docker.sh b/hack/jenkins/osx_integration_tests_docker.sh
index a177d0d41e..ff987a96b8 100755
--- a/hack/jenkins/osx_integration_tests_docker.sh
+++ b/hack/jenkins/osx_integration_tests_docker.sh
@@ -47,9 +47,4 @@ do
   fi
 done
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-install cron/cleanup_and_reboot_Darwin.sh $HOME/cleanup_and_reboot.sh || echo "FAILED TO INSTALL CLEANUP"
-echo "*/30 * * * * $HOME/cleanup_and_reboot.sh" | crontab
-crontab -l
-
 source common.sh
diff --git a/hack/jenkins/osx_integration_tests_hyperkit.sh b/hack/jenkins/osx_integration_tests_hyperkit.sh
index 52d81595f3..a8efe9ba0d 100755
--- a/hack/jenkins/osx_integration_tests_hyperkit.sh
+++ b/hack/jenkins/osx_integration_tests_hyperkit.sh
@@ -34,9 +34,4 @@ EXTRA_TEST_ARGS=""
 EXPECTED_DEFAULT_DRIVER="hyperkit"
 EXTERNAL="yes"
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-install cron/cleanup_and_reboot_Darwin.sh $HOME/cleanup_and_reboot.sh || echo "FAILED TO INSTALL CLEANUP"
-echo "*/30 * * * * $HOME/cleanup_and_reboot.sh" | crontab
-crontab -l
-
 source common.sh
diff --git a/hack/jenkins/osx_integration_tests_virtualbox.sh b/hack/jenkins/osx_integration_tests_virtualbox.sh
index 06aa488ba8..d20e90a41b 100755
--- a/hack/jenkins/osx_integration_tests_virtualbox.sh
+++ b/hack/jenkins/osx_integration_tests_virtualbox.sh
@@ -33,10 +33,4 @@ EXTRA_START_ARGS="--bootstrapper=kubeadm"
 # Assumes that hyperkit is also installed on the VirtualBox CI host.
 EXPECTED_DEFAULT_DRIVER="hyperkit"
 
-
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
-install cron/cleanup_and_reboot_Darwin.sh $HOME/cleanup_and_reboot.sh  || echo "FAILED TO GET INSTALL CLEANUP"
-echo "*/30 * * * * $HOME/cleanup_and_reboot.sh" | crontab
-crontab -l
-
 source common.sh
diff --git a/hack/jenkins/prbot.sh b/hack/jenkins/prbot.sh
old mode 100644
new mode 100755
diff --git a/hack/jenkins/preload_generation.sh b/hack/jenkins/preload_generation.sh
old mode 100644
new mode 100755
index 59b9fe7526..3be8587fab
--- a/hack/jenkins/preload_generation.sh
+++ b/hack/jenkins/preload_generation.sh
@@ -20,8 +20,8 @@
 
 set -eux -o pipefail
 
-mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/master/cron" cron || echo "FAILED TO GET CRON FILES"
-sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+MINIKUBE_LOCATION="master"
+source ./install_linux_crons.sh
 
 # Make sure the right golang version is installed based on Makefile
 ./hack/jenkins/installers/check_install_golang.sh /usr/local
diff --git a/hack/jenkins/upload_integration_report.sh b/hack/jenkins/upload_integration_report.sh
old mode 100644
new mode 100755

From 17a8bc4e7be00a93af61d4facc36a4594de425b0 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 12 May 2022 09:44:38 -0700
Subject: [PATCH 03/12] exit cleanly for unimplmented beta features

---
 cmd/minikube/cmd/service.go   | 6 ++++++
 cmd/minikube/cmd/start.go     | 5 +++++
 cmd/minikube/cmd/tunnel.go    | 5 +++++
 pkg/minikube/reason/reason.go | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go
index 59e4bfee16..d6b48f3d19 100644
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@@ -85,6 +85,12 @@ var serviceCmd = &cobra.Command{
 
 		cname := ClusterFlagValue()
 		co := mustload.Healthy(cname)
+
+		// Bail cleanly for qemu2 until implemented
+		if driver.IsQEMU(co.Config.Driver) {
+			exit.Message(reason.Unimplemented, "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.")
+		}
+
 		var services service.URLs
 		services, err := service.GetServiceURLs(co.API, co.Config.Name, namespace, serviceURLTemplate)
 		if err != nil {
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index ff6a2fad96..d431edd0d5 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -312,6 +312,11 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 		return node.Starter{}, errors.Wrap(err, "Failed to generate config")
 	}
 
+	// Bail cleanly for qemu2 until implemented
+	if driver.IsVM(cc.Driver) && runtime.GOARCH == "arm64" && cc.KubernetesConfig.ContainerRuntime != "docker" {
+		exit.Message(reason.Unimplemented, "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.")
+	}
+
 	// This is about as far as we can go without overwriting config files
 	if viper.GetBool(dryRun) {
 		out.Step(style.DryRun, `dry-run validation complete!`)
diff --git a/cmd/minikube/cmd/tunnel.go b/cmd/minikube/cmd/tunnel.go
index 161fa2f137..8baa76a9df 100644
--- a/cmd/minikube/cmd/tunnel.go
+++ b/cmd/minikube/cmd/tunnel.go
@@ -55,6 +55,11 @@ var tunnelCmd = &cobra.Command{
 		cname := ClusterFlagValue()
 		co := mustload.Healthy(cname)
 
+		// Bail cleanly for qemu2 until implemented
+		if driver.IsQEMU(co.Config.Driver) {
+			exit.Message(reason.Unimplemented, "minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.")
+		}
+
 		if cleanup {
 			klog.Info("Checking for tunnels to cleanup...")
 			if err := manager.CleanupNotRunningTunnels(); err != nil {
diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go
index 1b10ae3b60..e990ebce4d 100644
--- a/pkg/minikube/reason/reason.go
+++ b/pkg/minikube/reason/reason.go
@@ -71,6 +71,9 @@ var (
 	// user attempted to run a Windows executable (.exe) inside of WSL rather than using the Linux binary
 	WrongBinaryWSL = Kind{ID: "MK_WRONG_BINARY_WSL", ExitCode: ExProgramUnsupported}
 
+	// this feature is unimplemented for whatever reason
+	Unimplemented = Kind{ID: "MK_UNIMPLEMENTED", ExitCode: ExProgramUnsupported}
+
 	// minikube failed to create a new Docker Machine api client
 	NewAPIClient = Kind{ID: "MK_NEW_APICLIENT", ExitCode: ExProgramError}
 	// minikube could not disable an addon, e.g. dashboard addon

From 68731bf7c6c4ff6c820f2a5e52af25af0072cdc3 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 12 May 2022 10:10:07 -0700
Subject: [PATCH 04/12] move cron install to installers dir

---
 hack/jenkins/common.sh                                        | 4 ++--
 hack/jenkins/installers/check_install_gotestsum.sh            | 0
 .../check_install_linux_crons.sh}                             | 0
 .../check_install_osx_crons.sh}                               | 0
 hack/jenkins/preload_generation.sh                            | 3 +--
 5 files changed, 3 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 hack/jenkins/installers/check_install_gotestsum.sh
 rename hack/jenkins/{install_linux_crons.sh => installers/check_install_linux_crons.sh} (100%)
 rename hack/jenkins/{install_osx_crons.sh => installers/check_install_osx_crons.sh} (100%)

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 0b1e464728..ccc6a70812 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -102,9 +102,9 @@ GOROOT="/usr/local/go" ./installers/check_install_gotestsum.sh || true
 
 # install cron jobs
 if [ "$OS" == "linux" ]; then
-  source ./install_linux_crons.sh
+  source ./installers/check_install_linux_crons.sh
 else
-  source ./install_osx_crons.sh
+  source ./installers/check_install_osx_crons.sh
 fi
 
 # let's just clean all docker artifacts up
diff --git a/hack/jenkins/installers/check_install_gotestsum.sh b/hack/jenkins/installers/check_install_gotestsum.sh
old mode 100644
new mode 100755
diff --git a/hack/jenkins/install_linux_crons.sh b/hack/jenkins/installers/check_install_linux_crons.sh
similarity index 100%
rename from hack/jenkins/install_linux_crons.sh
rename to hack/jenkins/installers/check_install_linux_crons.sh
diff --git a/hack/jenkins/install_osx_crons.sh b/hack/jenkins/installers/check_install_osx_crons.sh
similarity index 100%
rename from hack/jenkins/install_osx_crons.sh
rename to hack/jenkins/installers/check_install_osx_crons.sh
diff --git a/hack/jenkins/preload_generation.sh b/hack/jenkins/preload_generation.sh
index 3be8587fab..2aeddd3aaf 100755
--- a/hack/jenkins/preload_generation.sh
+++ b/hack/jenkins/preload_generation.sh
@@ -20,8 +20,7 @@
 
 set -eux -o pipefail
 
-MINIKUBE_LOCATION="master"
-source ./install_linux_crons.sh
+source ./hack/jenkins/installers/check_install_linux_crons.sh
 
 # Make sure the right golang version is installed based on Makefile
 ./hack/jenkins/installers/check_install_golang.sh /usr/local

From c7ef1a7e6c731b3a5ef58c174f7af6de21529228 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 12 May 2022 10:11:22 -0700
Subject: [PATCH 05/12] more .sh files without exec permission

---
 hack/jenkins/test-flake-chart/compute_flake_rate.sh | 0
 hack/jenkins/test-flake-chart/sync_tests.sh         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 hack/jenkins/test-flake-chart/compute_flake_rate.sh
 mode change 100644 => 100755 hack/jenkins/test-flake-chart/sync_tests.sh

diff --git a/hack/jenkins/test-flake-chart/compute_flake_rate.sh b/hack/jenkins/test-flake-chart/compute_flake_rate.sh
old mode 100644
new mode 100755
diff --git a/hack/jenkins/test-flake-chart/sync_tests.sh b/hack/jenkins/test-flake-chart/sync_tests.sh
old mode 100644
new mode 100755

From 2ca1d5a757e457aafda74b97de23ec999a7da7ad Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 12 May 2022 10:50:16 -0700
Subject: [PATCH 06/12] downgrade default k8s version to 1.23.6

---
 pkg/minikube/constants/constants.go    | 2 +-
 site/content/en/docs/commands/start.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index def00b1d89..85271e1a3b 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -33,7 +33,7 @@ var (
 const (
 	// DefaultKubernetesVersion is the default Kubernetes version
 	// dont update till #10545 is solved
-	DefaultKubernetesVersion = "v1.24.0"
+	DefaultKubernetesVersion = "v1.23.6"
 	// 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.24.1-rc.0"
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 397e4994bf..9200a802d9 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -71,7 +71,7 @@ minikube start [flags]
       --interactive                       Allow user prompts for more information (default true)
       --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13762/minikube-v1.25.2-1651892774-13762-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1651892774-13762/minikube-v1.25.2-1651892774-13762-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1651892774-13762-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13762/minikube-v1.25.2-1651892774-13762.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1651892774-13762/minikube-v1.25.2-1651892774-13762.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1651892774-13762.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.24.0, 'latest' for v1.24.1-rc.0). Defaults to 'stable'.
+      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.6, 'latest' for v1.24.1-rc.0). Defaults to 'stable'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
       --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
       --kvm-network string                The KVM default network name. (kvm2 driver only) (default "default")

From 7fbcb9078901e8bea7920296bea6ac71205a36a3 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 12 May 2022 11:28:40 -0700
Subject: [PATCH 07/12] make ISO release script copies both ISOs

---
 hack/jenkins/build_iso.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hack/jenkins/build_iso.sh b/hack/jenkins/build_iso.sh
index 8a3c1b52b1..f9f93b2bc8 100755
--- a/hack/jenkins/build_iso.sh
+++ b/hack/jenkins/build_iso.sh
@@ -61,8 +61,10 @@ 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
+	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-amd64.iso gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-amd64.iso
+	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-amd64.iso.sha256 gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-amd64.iso.sha256
+	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-arm64.iso gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-arm64.iso
+	gsutil cp gs://${CURRENT_ISO_BUCKET}/minikube-${CURRENT_ISO_VERSION}-arm64.iso.sha256 gs://${ISO_BUCKET}/minikube-${ISO_VERSION}-arm64.iso.sha256
 fi
 
 git config user.name "minikube-bot"

From eec026da007385c2da2705e626dc3251d1999dbe Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Thu, 12 May 2022 20:21:22 +0000
Subject: [PATCH 08/12] Update auto-generated docs and translations

---
 site/content/en/docs/contrib/errorcodes.en.md | 3 +++
 translations/de.json                          | 3 +++
 translations/es.json                          | 3 +++
 translations/fr.json                          | 3 +++
 translations/ja.json                          | 3 +++
 translations/ko.json                          | 3 +++
 translations/pl.json                          | 3 +++
 translations/ru.json                          | 3 +++
 translations/strings.txt                      | 3 +++
 translations/zh-CN.json                       | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/site/content/en/docs/contrib/errorcodes.en.md b/site/content/en/docs/contrib/errorcodes.en.md
index 08e224a7b9..42705e32ac 100644
--- a/site/content/en/docs/contrib/errorcodes.en.md
+++ b/site/content/en/docs/contrib/errorcodes.en.md
@@ -19,6 +19,9 @@ minikube was interrupted by an OS signal
 "MK_WRONG_BINARY_WSL" (Exit code ExProgramUnsupported)  
 user attempted to run a Windows executable (.exe) inside of WSL rather than using the Linux binary  
 
+"MK_UNIMPLEMENTED" (Exit code ExProgramUnsupported)  
+this feature is unimplemented for whatever reason  
+
 "MK_NEW_APICLIENT" (Exit code ExProgramError)  
 minikube failed to create a new Docker Machine api client  
 
diff --git a/translations/de.json b/translations/de.json
index 44721ad2df..cc063fb109 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -889,6 +889,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "Addon '{{.name}}' ist derzeit nicht aktiviert.\nUm es zu aktivieren, führe Folgendes aus:\nminikube addons enable {{.name}}",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "Addon '{{.name}}' ist kein valides Addon welches mit Minikube paketiert ist.\nUm eine Liste der verfügbaren Addons anzuzeigen, führe Folgendes aus:\nminikube addons list",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons modifiziert Minikube Addon Dateien mittels Unter-Befehlen wie \"minikube addons enable dashboard\"",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "auto-pause für ein Addon ist ein Alpha-Feature und ist immer noch in Entwicklung. Bitte melde Issues um uns zu helfen das Feature zu verbessern.",
 	"bash completion failed": "bash completion fehlgeschlagen",
 	"bash completion.": "",
@@ -948,8 +949,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "Minikube Profil wurde erfolgreich gesetzt auf {{.profile_name}}",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "Minikube provisioniert und managed lokale Kubernetes Cluster optimiert für Entwicklungs-Workflows.",
 	"minikube quickly sets up a local Kubernetes cluster": "Minikube installiert schnell einen lokalen Kubernetes Cluster",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "Minikube überspringt diverse Validierungen wenn --force angegeben ist; das könnte zu unerwartetem Verhalten führen",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "Minikube {{.version}} ist verfügbar. Lade es herunter: {{.url}}",
 	"mkcmp is used to compare performance of two minikube binaries": "mkcmp wird verwendet um die Performance von zwei Minikube Binaries zu vergleichen",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "Das Argument \"{{.value}}\" für Mount muss in der Form \u003cQuell Verzeichnis\u003e:\u003cZiel Verzeichnis\u003e",
diff --git a/translations/es.json b/translations/es.json
index ba473f36f3..282860686d 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -891,6 +891,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "",
 	"bash completion failed": "",
 	"bash completion.": "",
@@ -948,8 +949,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "",
 	"minikube quickly sets up a local Kubernetes cluster": "",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
diff --git a/translations/fr.json b/translations/fr.json
index d9d0aa89b4..d9125ff7fa 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -855,6 +855,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "Le module '{{.name}}' n'est actuellement pas activé.\nPour activer ce module, exécutez :\nminikube addons enable {{.name}}",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "Le module '{{.name}}' n'est pas un module valide fourni avec minikube.\nPour voir la liste des modules disponibles, exécutez :\nminikube addons list",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons modifie les fichiers de modules minikube à l'aide de sous-commandes telles que \"minikube addons enable dashboard\"",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "Le module auto-pause est une fonctionnalité alpha et encore en développement précoce. Veuillez signaler les problèmes pour nous aider à l'améliorer.",
 	"bash completion failed": "échec de la complétion bash",
 	"bash completion.": "complétion bash",
@@ -914,8 +915,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "Le profil de minikube a été défini avec succès sur {{.profile_name}}",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube provisionne et gère des clusters Kubernetes locaux optimisés pour les workflows de développement.",
 	"minikube quickly sets up a local Kubernetes cluster": "minikube configure rapidement un cluster Kubernetes local",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "minikube ignore diverses validations lorsque --force est fourni ; cela peut conduire à un comportement inattendu",
 	"minikube status --output OUTPUT. json, text": "état minikube --sortie SORTIE. json, texte",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} est disponible ! Téléchargez-le ici : {{.url}}",
 	"mkcmp is used to compare performance of two minikube binaries": "mkcmp est utilisé pour comparer les performances de deux binaires minikube",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "argument de montage \"{{.value}}\" doit être de la forme : \u003cdossier source\u003e:\u003cdossier de destination\u003e",
diff --git a/translations/ja.json b/translations/ja.json
index 05b1c3c397..ea8e63563c 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -899,6 +899,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "'{{.name}}' アドオンは現在無効になっています。\n有効にするためには、以下のコマンドを実行してください。 \nminikube addons enable {{.name}}",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "'{{.name}}' は minikube にパッケージングされた有効なアドオンではありません。\n利用可能なアドオンの一覧を表示するためには、以下のコマンドを実行してください。 \nminikube addons list",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons コマンドは「minikube addons enable dashboard」のようなサブコマンドを使用することで、minikube アドオンファイルを修正します",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "auto-pause アドオンはアルファ機能で、まだ開発の初期段階です。auto-pause アドオン改善の手助けのために、問題は報告してください。",
 	"bash completion failed": "bash のコマンド補完に失敗しました",
 	"bash completion.": "bash のコマンド補完です。",
@@ -964,8 +965,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "無事 minikube のプロファイルが {{.profile_name}} に設定されました",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube は、開発ワークフロー用に最適化されたローカル Kubernetes クラスターを構築・管理します。",
 	"minikube quickly sets up a local Kubernetes cluster": "minikube はローカル Kubernetes クラスターを迅速にセットアップします",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "minikube は --force が付与された場合、様々な検証をスキップします (これは予期せぬ挙動を引き起こすかも知れません)",
 	"minikube status --output OUTPUT. json, text": "minikube status --output OUTPUT. json, text",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} が利用可能です！次の URL からダウンロードしてください: {{.url}}",
 	"mkcmp is used to compare performance of two minikube binaries": "mkcmp で 2 つの minikube のバイナリーのパフォーマンスを比較できます",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "マウント引数「{{.value}}」は次の形式でなければなりません: \u003cソースディレクトリー\u003e:\u003cターゲットディレクトリー\u003e",
diff --git a/translations/ko.json b/translations/ko.json
index 4124c03d0f..94258c16f4 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -894,6 +894,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "",
 	"bash completion failed": "bash 자동 완성이 실패하였습니다",
 	"bash completion.": "",
@@ -958,8 +959,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube는 개발 워크플로우에 최적화된 로컬 쿠버네티스를 제공하고 관리합니다.",
 	"minikube quickly sets up a local Kubernetes cluster": "",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} 이 사용가능합니다! 다음 경로에서 다운받으세요: {{.url}}",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
diff --git a/translations/pl.json b/translations/pl.json
index 7579e399a0..7e657a8c22 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -902,6 +902,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "",
 	"bash completion failed": "",
 	"bash completion.": "",
@@ -960,8 +961,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "profil minikube został z powodzeniem zmieniony na: {{.profile_name}}",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube dostarcza lokalne klastry Kubernetesa zoptymalizowane do celów rozwoju oprogramowania oraz zarządza nimi",
 	"minikube quickly sets up a local Kubernetes cluster": "minikube szybko inicjalizuje lokalny klaster Kubernetesa",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "użycie flagi --force sprawia, że minikube pomija pewne walidacje, co może skutkować niespodziewanym zachowaniem",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} jest dostępne! Pobierz je z: {{.url}}",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
diff --git a/translations/ru.json b/translations/ru.json
index f8e31afa4f..09629a62ca 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -825,6 +825,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "",
 	"bash completion failed": "",
 	"bash completion.": "",
@@ -882,8 +883,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "",
 	"minikube quickly sets up a local Kubernetes cluster": "",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
diff --git a/translations/strings.txt b/translations/strings.txt
index a918c0c5f8..33d64ccf9f 100644
--- a/translations/strings.txt
+++ b/translations/strings.txt
@@ -825,6 +825,7 @@
 	"addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "",
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "",
 	"bash completion failed": "",
 	"bash completion.": "",
@@ -882,8 +883,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "",
 	"minikube quickly sets up a local Kubernetes cluster": "",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index d49563e933..5a4828e0e9 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -1010,6 +1010,7 @@
 	"addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "",
 	"addon enable failed": "启用插件失败",
 	"addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "插件使用诸如 \"minikube addons enable dashboard\" 的子命令修改 minikube 的插件文件",
+	"arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "",
 	"bash completion failed": "",
 	"bash completion.": "",
@@ -1070,8 +1071,10 @@
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "",
 	"minikube quickly sets up a local Kubernetes cluster": "",
+	"minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "",
 	"minikube status --output OUTPUT. json, text": "",
+	"minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "mkcmp 用于对比两个 minikube 二进制的性能",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",

From 0663e50a2b9b05fb2f1a3ff1f7bea7cb60359f73 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 12 May 2022 13:29:52 -0700
Subject: [PATCH 09/12] downgrade latest to 1.23.6

---
 pkg/minikube/constants/constants.go    | 2 +-
 site/content/en/docs/commands/start.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 85271e1a3b..505b18e8a2 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -36,7 +36,7 @@ const (
 	DefaultKubernetesVersion = "v1.23.6"
 	// 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.24.1-rc.0"
+	NewestKubernetesVersion = "v1.23.6"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.16.0"
 	// NoKubernetesVersion is the version used when users does NOT want to install kubernetes
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 9200a802d9..4d1473d1b9 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -71,7 +71,7 @@ minikube start [flags]
       --interactive                       Allow user prompts for more information (default true)
       --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13762/minikube-v1.25.2-1651892774-13762-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1651892774-13762/minikube-v1.25.2-1651892774-13762-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1651892774-13762-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13762/minikube-v1.25.2-1651892774-13762.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1651892774-13762/minikube-v1.25.2-1651892774-13762.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1651892774-13762.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.6, 'latest' for v1.24.1-rc.0). Defaults to 'stable'.
+      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.6, 'latest' for v1.23.6). 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")

From b9e04c5cb21a9a92c7d0663e9682a37b8e5dd7fb Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Thu, 12 May 2022 13:43:26 -0700
Subject: [PATCH 10/12] remove 1.24 yamls

---
 .../testdata/v1.24/containerd-api-port.yaml   | 72 -----------------
 .../v1.24/containerd-pod-network-cidr.yaml    | 72 -----------------
 .../bsutil/testdata/v1.24/containerd.yaml     | 72 -----------------
 .../testdata/v1.24/crio-options-gates.yaml    | 79 -------------------
 .../bsutil/testdata/v1.24/crio.yaml           | 72 -----------------
 .../bsutil/testdata/v1.24/default.yaml        | 72 -----------------
 .../bsutil/testdata/v1.24/dns.yaml            | 72 -----------------
 .../testdata/v1.24/image-repository.yaml      | 73 -----------------
 .../bsutil/testdata/v1.24/options.yaml        | 76 ------------------
 9 files changed, 660 deletions(-)
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
 delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml

diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
deleted file mode 100644
index c0d6a2e107..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 12345
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:12345
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
deleted file mode 100644
index ad0f6e2d5f..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "192.168.32.0/20"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "192.168.32.0/20"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
deleted file mode 100644
index b57437de99..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /run/containerd/containerd.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
deleted file mode 100644
index c071093bf1..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-    fail-no-swap: "true"
-    feature-gates: "a=b"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    feature-gates: "a=b"
-    kube-api-burst: "32"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    feature-gates: "a=b"
-    leader-elect: "false"
-    scheduler-name: "mini-scheduler"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
-mode: "iptables"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
deleted file mode 100644
index e610321bef..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /var/run/crio/crio.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
deleted file mode 100644
index a7d163f7ae..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /var/run/dockershim.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
deleted file mode 100644
index f304a30dd2..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /var/run/dockershim.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: minikube.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "minikube.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
deleted file mode 100644
index 232c8785ab..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /var/run/dockershim.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-imageRepository: test/repo
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
deleted file mode 100644
index 71046482a4..0000000000
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: InitConfiguration
-localAPIEndpoint:
-  advertiseAddress: 1.1.1.1
-  bindPort: 8443
-bootstrapTokens:
-  - groups:
-      - system:bootstrappers:kubeadm:default-node-token
-    ttl: 24h0m0s
-    usages:
-      - signing
-      - authentication
-nodeRegistration:
-  criSocket: /var/run/dockershim.sock
-  name: "mk"
-  kubeletExtraArgs:
-    node-ip: 1.1.1.1
-  taints: []
----
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-apiServer:
-  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-  extraArgs:
-    enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
-    fail-no-swap: "true"
-controllerManager:
-  extraArgs:
-    allocate-node-cidrs: "true"
-    kube-api-burst: "32"
-    leader-elect: "false"
-scheduler:
-  extraArgs:
-    leader-elect: "false"
-    scheduler-name: "mini-scheduler"
-certificatesDir: /var/lib/minikube/certs
-clusterName: mk
-controlPlaneEndpoint: control-plane.minikube.internal:8443
-etcd:
-  local:
-    dataDir: /var/lib/minikube/etcd
-    extraArgs:
-      proxy-refresh-interval: "70000"
-kubernetesVersion: v1.24.0
-networking:
-  dnsDomain: cluster.local
-  podSubnet: "10.244.0.0/16"
-  serviceSubnet: 10.96.0.0/12
----
-apiVersion: kubelet.config.k8s.io/v1beta1
-kind: KubeletConfiguration
-authentication:
-  x509:
-    clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: systemd
-clusterDomain: "cluster.local"
-# disable disk resource management by default
-imageGCHighThresholdPercent: 100
-evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
-failSwapOn: false
-staticPodPath: /etc/kubernetes/manifests
----
-apiVersion: kubeproxy.config.k8s.io/v1alpha1
-kind: KubeProxyConfiguration
-clusterCIDR: "10.244.0.0/16"
-metricsBindAddress: 0.0.0.0:10249
-conntrack:
-  maxPerCore: 0
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established"
-  tcpEstablishedTimeout: 0s
-# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close"
-  tcpCloseWaitTimeout: 0s
-mode: "iptables"

From 8daa86141a8458737c6b4198edb162ff40d881f4 Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Thu, 12 May 2022 22:38:29 +0000
Subject: [PATCH 11/12] Update kicbase to v0.0.31

---
 pkg/drivers/kic/types.go               | 6 +++---
 site/content/en/docs/commands/start.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
index 026e62582a..dad8c54d6e 100644
--- a/pkg/drivers/kic/types.go
+++ b/pkg/drivers/kic/types.go
@@ -24,13 +24,13 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.30-1652309540-13791"
+	Version = "v0.0.31"
 	// SHA of the kic base image
 	baseImageSHA = "c3375f1b260bd936aa532a0c749626e07d94ab129a7f2395e95345aa04ca708c"
 	// The name of the GCR kicbase repository
-	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
+	gcrRepo = "gcr.io/k8s-minikube/kicbase"
 	// The name of the Dockerhub kicbase repository
-	dockerhubRepo = "docker.io/kicbase/build"
+	dockerhubRepo = "docker.io/kicbase/stable"
 )
 
 var (
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 42b05f6f39..9c8a4b7a88 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -26,7 +26,7 @@ minikube start [flags]
       --apiserver-names strings           A set of apiserver names which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.30-1652309540-13791@sha256:c3375f1b260bd936aa532a0c749626e07d94ab129a7f2395e95345aa04ca708c")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.31@sha256:c3375f1b260bd936aa532a0c749626e07d94ab129a7f2395e95345aa04ca708c")
       --binary-mirror string              Location to fetch kubectl, kubelet, & kubeadm binaries from.
       --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
       --cert-expiration duration          Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

From d6c04122e1b26b13140368df7ab5bce8ce022f0e Mon Sep 17 00:00:00 2001
From: minikube-bot <minikube-bot@google.com>
Date: Thu, 12 May 2022 22:51:40 +0000
Subject: [PATCH 12/12] Update ISO to v1.26.0-beta.0

---
 Makefile                               | 2 +-
 pkg/minikube/download/iso.go           | 2 +-
 site/content/en/docs/commands/start.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7d164099fd..5c31fb25a7 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.25.2-1652310010-13791
+ISO_VERSION ?= v1.26.0-beta.0
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 DEB_REVISION ?= 0
diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
index 88ee7f145d..404359a48a 100644
--- a/pkg/minikube/download/iso.go
+++ b/pkg/minikube/download/iso.go
@@ -41,7 +41,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/13791"
+	isoBucket := "minikube/iso"
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
 		fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH),
diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
index 42b05f6f39..d03808ec59 100644
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@@ -69,7 +69,7 @@ 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/13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13791/minikube-v1.25.2-1652310010-13791.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1652310010-13791/minikube-v1.25.2-1652310010-13791.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1652310010-13791.iso])
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.26.0-beta.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-beta.0/minikube-v1.26.0-beta.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-beta.0-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.0-beta.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-beta.0/minikube-v1.26.0-beta.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-beta.0.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.6, 'latest' for v1.23.6). Defaults to 'stable'.
       --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube