Merge pull request #15695 from spowelljr/fixTestYAMLs

Fix unit test yamls for kubernetes 1.26

Author: medyagh

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

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

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

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

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

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

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

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

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

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"