Revert "Disable kubelet fail on cgroupv1 on kind (#5143)" (#5149)

This reverts commit fb88138.

Author: snarkychef

projects/kubernetes-sigs/kind/CHECKSUMS

@@ -1,4 +1,4 @@
-7f22aca498cfe51e752d738c82cbab251868aefc4a086081f2ad3f433ad6274b  _output/bin/kind/linux-amd64/kind
-4bf9ed9ddc1b4bc22d53a1a8119de2e6e05e13924f4ee78541f695d4f58d7d0d  _output/bin/kind/linux-amd64/kindnetd
-156939f66cbae4e3f857ee424cfd490086cc13de053eaa5c8502c8ae52b75dc4  _output/bin/kind/linux-arm64/kind
-630246bbe7e172e88fcc08f09d0d2f97a5f6122f3431ff3284f3ffa71ff60a62  _output/bin/kind/linux-arm64/kindnetd
+6efda113dea98399fbc624d9a415f3fabf9281231095adf17cd135495c651842  _output/bin/kind/linux-amd64/kind
+44b5eae4023903016ba5b6872513cfd8b804d861f74d903b05669c691c405ff6  _output/bin/kind/linux-amd64/kindnetd
+73a0ef28be2fe7609d8ebb283c48f14e5324eaf79b237927ffb7e5a6547d5ec3  _output/bin/kind/linux-arm64/kind
+4729ab4410e722685499d12812a3306070a1a1b1e2a3a2e6628366128200b940  _output/bin/kind/linux-arm64/kindnetd

projects/kubernetes-sigs/kind/patches/0001-Switch-to-AL2-base-image-for-node-image.patch

@@ -1,7 +1,7 @@
-From c89d1a684f339921502ecd8f3d06bb147a10265b Mon Sep 17 00:00:00 2001
+From af841b3f8a820b38ce61fe05efd716c963bff064 Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Thu, 29 Jun 2023 00:56:53 -0700
-Subject: [PATCH 1/8] Switch to AL2 base image for node image
+Subject: [PATCH 1/7] Switch to AL2 base image for node image
 
 ---
  images/base/Dockerfile                        | 218 ++++++------------

projects/kubernetes-sigs/kind/patches/0002-skip-ctr-pulling-required-images-since-the-build-rem.patch

@@ -1,7 +1,7 @@
-From 2a0a964208a712d18ceb14e79f328440c373e22a Mon Sep 17 00:00:00 2001
+From 23a4701eb8d6081f61c68414bbb8ee3c103d1243 Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Sat, 2 Apr 2022 22:01:04 -0500
-Subject: [PATCH 2/8] skip ctr pulling required images since the build removes
+Subject: [PATCH 2/7] skip ctr pulling required images since the build removes
  them anyway
 
 ---

projects/kubernetes-sigs/kind/patches/0003-Patch-haproxy-maxconn-value-to-avoid-ulimit-issue.patch

@@ -1,7 +1,7 @@
-From f090606f2a4fba4a24741db40370af7ed752f90f Mon Sep 17 00:00:00 2001
+From 326c89f28813f347fb47c6fc1a803286ac4604d4 Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Wed, 19 Apr 2023 12:28:28 -0500
-Subject: [PATCH 3/8] Patch haproxy maxconn value to avoid ulimit issue
+Subject: [PATCH 3/7] Patch haproxy maxconn value to avoid ulimit issue
 
 EKS-A uses haproxy 2.5 which errors if the maxconn value
 requires more FDs than allowed by the ulimit setting of docker.

projects/kubernetes-sigs/kind/patches/0004-Disable-cgroupns-private-to-fix-cluster-creation-on-.patch

@@ -1,7 +1,7 @@
-From 614562f681c605640ea42118132dda68809f1746 Mon Sep 17 00:00:00 2001
+From bea2412acd3e40f97dce8ba23fd8718ab58f3ce1 Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Sat, 19 Aug 2023 09:21:55 -0500
-Subject: [PATCH 4/8] Disable cgroupns=private to fix cluster creation on AL2
+Subject: [PATCH 4/7] Disable cgroupns=private to fix cluster creation on AL2
 
 ---
  pkg/cluster/internal/providers/docker/provision.go | 3 ++-

projects/kubernetes-sigs/kind/patches/0005-TEMP-lock-containerd-and-runc-version.patch

@@ -1,7 +1,7 @@
-From 49fbf65b3cfa2cc709e1e30228e50b31003f2f3a Mon Sep 17 00:00:00 2001
+From 5b7a9f7376920449cc6363316b1c6e9de7b48d8b Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Sun, 20 Aug 2023 14:30:06 -0500
-Subject: [PATCH 5/8] TEMP: lock containerd and runc version
+Subject: [PATCH 5/7] TEMP: lock containerd and runc version
 
 ---
  images/base/Dockerfile | 4 ++++

projects/kubernetes-sigs/kind/patches/0006-Use-docker_tag-file-to-fetch-Kubernetes-source-versi.patch

@@ -1,7 +1,7 @@
-From 5c97ca01146e21541692694bcfc237bc62d3807d Mon Sep 17 00:00:00 2001
+From c104da44ef84a8a60b62d94241b869079d3e1fd2 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Mon, 11 Nov 2024 17:25:26 -0800
-Subject: [PATCH 6/8] Use docker_tag file to fetch Kubernetes source version
+Subject: [PATCH 6/7] Use docker_tag file to fetch Kubernetes source version
 
 Kind v0.25.0 introduced a change to use the `version` file in the Kubernetes server binaries tarball to
 fetch the Kubernetes source version. But the server tarball from EKS Distro does not include this file.

…d-socket-wait-timeout-for-QEMU-emu.patch …inerd-socket-wait-timeout-for-QEMU.patchprojects/kubernetes-sigs/kind/patches/0007-Increase-containerd-socket-wait-timeout-for-QEMU-emu.patch renamed to projects/kubernetes-sigs/kind/patches/0007-Increase-containerd-socket-wait-timeout-for-QEMU.patch projects/kubernetes-sigs/kind/patches/0007-Increase-containerd-socket-wait-timeout-for-QEMU-emu.patch renamed to projects/kubernetes-sigs/kind/patches/0007-Increase-containerd-socket-wait-timeout-for-QEMU.patch

@@ -1,7 +1,7 @@
-From e0548602f71b7e4673762a23b532497dd2156edf Mon Sep 17 00:00:00 2001
+From 9b8e331a25cb950f9e323ec557ffdf2e94f59c8e Mon Sep 17 00:00:00 2001
 From: EKS Anywhere Team <eks-anywhere@amazon.com>
 Date: Mon, 12 Jan 2026 12:00:00 -0800
-Subject: [PATCH 7/8] Increase containerd socket wait timeout for QEMU
+Subject: [PATCH 7/7] Increase containerd socket wait timeout for QEMU
  emulation
 
 The default 6-second timeout (0+1+2+3) in WaitForReady() is insufficient