From f289f766c39fed611f6c6f17225faa5d939108a3 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Mon, 23 Jan 2023 17:24:12 -0800
Subject: [PATCH] fix test yamls

---
 .../templates/v1beta3/containerd-api-port.yaml                 | 3 ++-
 .../templates/v1beta3/containerd-pod-network-cidr.yaml         | 3 ++-
 .../kubernetes_version/templates/v1beta3/containerd.yaml       | 3 ++-
 .../templates/v1beta3/crio-options-gates.yaml                  | 3 ++-
 hack/update/kubernetes_version/templates/v1beta3/crio.yaml     | 3 ++-
 hack/update/kubernetes_version/templates/v1beta3/default.yaml  | 3 ++-
 hack/update/kubernetes_version/templates/v1beta3/dns.yaml      | 3 ++-
 .../kubernetes_version/templates/v1beta3/image-repository.yaml | 3 ++-
 hack/update/kubernetes_version/templates/v1beta3/options.yaml  | 3 ++-
 .../bsutil/testdata/v1.19/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.19/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.20/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.20/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.20/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.21/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.21/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.21/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.22/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.22/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.23/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.23/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.24/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.24/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.25/containerd-api-port.yaml             | 2 +-
 .../bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml     | 2 +-
 .../bootstrapper/bsutil/testdata/v1.25/containerd.yaml         | 2 +-
 .../bsutil/testdata/v1.26/containerd-api-port.yaml             | 3 ++-
 .../bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml     | 3 ++-
 .../bootstrapper/bsutil/testdata/v1.26/containerd.yaml         | 3 ++-
 .../bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml | 3 ++-
 pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml      | 3 ++-
 pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml   | 3 ++-
 pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml       | 3 ++-
 .../bootstrapper/bsutil/testdata/v1.26/image-repository.yaml   | 3 ++-
 pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml   | 3 ++-
 39 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
index 4ff3880c6f..7b46b2fcd5 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
index 5bb354e0ac..0b14634f79 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
index a41e1dede3..0700426ea5 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
index 3404871156..8f06d0c9bf 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
@@ -56,6 +56,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -65,7 +67,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml
index f7acdef6d3..8e95541b6c 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/default.yaml b/hack/update/kubernetes_version/templates/v1beta3/default.yaml
index 6787ce679e..5c4ee61fbd 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/default.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/default.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml
index 324b0acffa..3387cb9a3d 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "minikube.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
index d1d75e93e4..df980fb545 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
@@ -51,6 +51,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -60,7 +62,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/hack/update/kubernetes_version/templates/v1beta3/options.yaml b/hack/update/kubernetes_version/templates/v1beta3/options.yaml
index 219a12c45b..b608822891 100644
--- a/hack/update/kubernetes_version/templates/v1beta3/options.yaml
+++ b/hack/update/kubernetes_version/templates/v1beta3/options.yaml
@@ -53,6 +53,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -62,7 +64,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
index fb571e6a3f..3e83c315dc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
index 3a5b21779c..a3aeff370a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
index c7f58af531..33fbd96c8c 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-api-port.yaml
index a14004cea0..f3206df7ed 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-api-port.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-pod-network-cidr.yaml
index ae78c83e2a..683ae434da 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-pod-network-cidr.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd.yaml
index 08daa24180..dbe8756d95 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-api-port.yaml
index 09b0971170..9c67aa0d29 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-api-port.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-pod-network-cidr.yaml
index 057a947793..79d5b2d411 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-pod-network-cidr.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd.yaml
index 34c8142fd6..bfcaa98467 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml
index 03378418da..88198f3a5b 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-api-port.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml
index fc0fde88d5..42a3f48168 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd-pod-network-cidr.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml
index cfbdaed96e..ceebe37e37 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.22/containerd.yaml
@@ -51,7 +51,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml
index baa211c625..7b46b2fcd5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-api-port.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml
index a0604056ec..0b14634f79 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd-pod-network-cidr.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml
index 4ca004be58..0700426ea5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.23/containerd.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
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
index 070746c3f5..9c1f32e2e4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
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
index d984ac1ae0..b91a260532 100644
--- 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
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
index 6bd3c29cff..9df6aaa449 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml
index 7d8426cec9..cd57de3e0f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml
index 51898a2f39..744eb4a75a 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml
index 9a4ebdf597..9ef1d535b7 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml
@@ -49,7 +49,7 @@ kind: KubeletConfiguration
 authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
-cgroupDriver: cgroupfs
+cgroupDriver: systemd
 hairpinMode: hairpin-veth
 runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml
index b50005bd5c..84efceb9d5 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml
index d5e4fa1d06..d5ef4eb624 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml
index 76b7a7d6ce..e72a72f872 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml
index 688c5b395f..8e99759756 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml
@@ -56,6 +56,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -65,7 +67,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml
index b9df2c4750..5ce85a9edc 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml
index f903f109ed..0a8c6e1754 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml
index 438c8cdff3..134490b4e4 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml
@@ -50,6 +50,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "minikube.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -59,7 +61,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml
index a0f77fe1b5..7a2d52fb0f 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml
@@ -51,6 +51,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -60,7 +62,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml
index 7c83f13395..9e49d17d06 100644
--- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml
+++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml
@@ -53,6 +53,8 @@ authentication:
   x509:
     clientCAFile: /var/lib/minikube/certs/ca.crt
 cgroupDriver: systemd
+hairpinMode: hairpin-veth
+runtimeRequestTimeout: 15m
 clusterDomain: "cluster.local"
 # disable disk resource management by default
 imageGCHighThresholdPercent: 100
@@ -62,7 +64,6 @@ evictionHard:
   imagefs.available: "0%"
 failSwapOn: false
 staticPodPath: /etc/kubernetes/manifests
-resolvConf: /etc/kubelet-resolv.conf
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration