Revert failCGroupv1 image-builder patch (#5146)

snarkychef · web-flow · commit 314ee97276d9 · 2026-02-12T01:04:34.000+05:30
diff --git a/projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch
@@ -1,7 +1,7 @@
-From 6aed2d6d104d0e1caf2a5ef8477f67e93a4b04be Mon Sep 17 00:00:00 2001
+From 167f39fe418ffe081a28e7895a95676704a4a749 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Tue, 11 Jan 2022 21:05:13 -0800
-Subject: [PATCH 01/19] OVA improvements
+Subject: [PATCH 01/18] OVA improvements
 
 - Create /etc/pki/tls/certs dir as part of image-builds
 - Tweak Product info in OVF
@@ -74,5 +74,5 @@ index f189b2c93..3524b8d13 100644
      "enable_disk_packing": "true",
      "existing_ansible_ssh_args": "{{env `ANSIBLE_SSH_ARGS`}}",
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0002-EKS-D-support-and-changes.patch b/projects/kubernetes-sigs/image-builder/patches/0002-EKS-D-support-and-changes.patch
@@ -1,7 +1,7 @@
-From 19941a18dde1d3aeba12e7eb8555507604d8e0ba Mon Sep 17 00:00:00 2001
+From fe0852d73259e333ad4052a469dc1fcbf21e3c11 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Tue, 11 Jan 2022 18:36:56 -0800
-Subject: [PATCH 02/19] EKS-D support and changes
+Subject: [PATCH 02/18] EKS-D support and changes
 
 - Add goss validations for EKS-D artifacts
 - Add etcdadm and etcd.tar.gz to image for unstacked etcd support
@@ -314,4 +314,5 @@ index 512f5e0d1..0a9c4247b 100644
        "version": "{{user `goss_version`}}"
      }
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
+
diff --git a/projects/kubernetes-sigs/image-builder/patches/0003-Snow-AMI-support.patch b/projects/kubernetes-sigs/image-builder/patches/0003-Snow-AMI-support.patch
@@ -1,7 +1,7 @@
-From d97dfb1765cd6e85cb871a870a7351eaa9c9bd46 Mon Sep 17 00:00:00 2001
+From 7afc506f09cd4cbd09596e75f089f48322342353 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 2 Feb 2023 01:39:15 -0800
-Subject: [PATCH 03/19] Snow AMI support
+Subject: [PATCH 03/18] Snow AMI support
 
 ---
  images/capi/packer/ami/packer.json | 12 ++++++++++--
@@ -50,5 +50,5 @@ index d711fb271..6461762a2 100644
 +}
 \ No newline at end of file
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0004-RHEL-support-and-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0004-RHEL-support-and-improvements.patch
@@ -1,7 +1,7 @@
-From 036e7c0340c406daaa7223d893f010555b0f0cc9 Mon Sep 17 00:00:00 2001
+From 177af49c6a7bcab30b519e6a2d3ed5bf85b0c64a Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Tue, 6 Dec 2022 15:42:02 -0600
-Subject: [PATCH 04/19] RHEL support and improvements
+Subject: [PATCH 04/18] RHEL support and improvements
 
 - Fix redhat 9 cloud-init feature flags bug
 - Fix ensure iptables present for rhel
@@ -171,4 +171,5 @@ index 030e7f5cf..d9240c4df 100644
 +    lock_timeout: 60
 +  when: ansible_os_family == "RedHat" and ansible_distribution == "RedHat" and ansible_distribution_major_version == "9"
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
+
diff --git a/projects/kubernetes-sigs/image-builder/patches/0005-Nutanix-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0005-Nutanix-improvements.patch
@@ -1,7 +1,7 @@
-From e0305f3f092a6f439c38304a5b9cc29c27b16f8f Mon Sep 17 00:00:00 2001
+From 4576e31105e5d9c3c7da5098c56c9f02d1d00b52 Mon Sep 17 00:00:00 2001
 From: Ilya Alekseyev <ilya.alekseyev@nutanix.com>
 Date: Wed, 11 Oct 2023 22:07:22 -0400
-Subject: [PATCH 05/19] Nutanix improvements
+Subject: [PATCH 05/18] Nutanix improvements
 
 - Fetch Nutanix RHEL source image URL from environment
 - Force-delete Nutanix builder VMs on failure
@@ -63,5 +63,5 @@ index b7dddb4f2..31748c84b 100644
    "shutdown_command": "shutdown -P now",
    "user_data": "I2Nsb3VkLWNvbmZpZwp1c2VyczoKICAtIG5hbWU6IGJ1aWxkZXIKICAgIHN1ZG86IFsnQUxMPShBTEwpIE5PUEFTU1dEOkFMTCddCmNocGFzc3dkOgogIGxpc3Q6IHwKICAgIGJ1aWxkZXI6YnVpbGRlcgogIGV4cGlyZTogRmFsc2UKc3NoX3B3YXV0aDogVHJ1ZQ=="
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0006-adds-retries-and-timeout-to-packer-image-builder.patch b/projects/kubernetes-sigs/image-builder/patches/0006-adds-retries-and-timeout-to-packer-image-builder.patch
@@ -1,7 +1,7 @@
-From 70f0d1221d411e8202bfcdb82b207bb04ca579f1 Mon Sep 17 00:00:00 2001
+From 847dfdfea8893be06fee6822048f50af466219bb Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Wed, 5 Nov 2025 14:02:23 -0800
-Subject: [PATCH 06/19] adds retries and timeout to packer image-builder
+Subject: [PATCH 06/18] adds retries and timeout to packer image-builder
 
 Add retries and timeouts to ansible tasks, also allow user specify
 ssh_timeout and ssh_handshake_attempts through user input.
@@ -205,4 +205,5 @@ index 0a9c4247b..ca4a4b6b9 100644
        "type": "qemu",
        "vm_name": "{{user `vm_name`}}"
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
+
diff --git a/projects/kubernetes-sigs/image-builder/patches/0007-Networking-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0007-Networking-improvements.patch
@@ -1,7 +1,7 @@
-From bca3d19b6736e6dd84de3e828e85ad05fdb88868 Mon Sep 17 00:00:00 2001
+From 625d899972bb2676ff02c08911dc01153983f5dc Mon Sep 17 00:00:00 2001
 From: Taylor Neyland <tneyla@amazon.com>
 Date: Wed, 19 Jul 2023 12:51:30 -0500
-Subject: [PATCH 07/19] Networking improvements
+Subject: [PATCH 07/18] Networking improvements
 
 - Disable UDP offload service for Redhat and Ubuntu
 - Default Flatcar version to avoid pulling from internet on every make
@@ -125,5 +125,5 @@ index 186361925..ba57019c8 100644
 +    state: stopped
 +  when: ansible_distribution_version is version('22.04', '>=')
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0008-Support-and-improvements-for-RHEL-9-EFI.patch b/projects/kubernetes-sigs/image-builder/patches/0008-Support-and-improvements-for-RHEL-9-EFI.patch
@@ -1,7 +1,7 @@
-From b27cadaaed5ddff062d7f3e94a9be0c6ce8ef74a Mon Sep 17 00:00:00 2001
+From 2f14f5fc3e423de63b1320252d4a90fb7b5fc603 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Mon, 19 Aug 2024 10:14:26 -0700
-Subject: [PATCH 08/19] Support and improvements for RHEL 9 EFI
+Subject: [PATCH 08/18] Support and improvements for RHEL 9 EFI
 
 1. Remove 2 unwanted partitions (the swap partition and /boot
 partition).
@@ -50,5 +50,5 @@ index 23cd4ed34..586c063a8 100644
 +parted -s /dev/sda set 2 esp on
 +%end
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0009-Pin-Packer-Goss-plugin-version-to-3.1.4.patch b/projects/kubernetes-sigs/image-builder/patches/0009-Pin-Packer-Goss-plugin-version-to-3.1.4.patch
@@ -1,7 +1,7 @@
-From debaa7b8be150c00fabb288616d864159b3756c8 Mon Sep 17 00:00:00 2001
+From 20a289f8a52a0a9d98ba120d1e66de2a698c1578 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 19 Sep 2024 15:36:00 -0700
-Subject: [PATCH 09/19] Pin Packer Goss plugin version to 3.1.4
+Subject: [PATCH 09/18] Pin Packer Goss plugin version to 3.1.4
 
 Upstream image-builder moved from installing packer-provisioner-goss through a script to installing it
 via Packer config (https://github.com/kubernetes-sigs/image-builder/commit/c0b70ae37c4aac14c156fc7b907a9b35147757df).
@@ -27,5 +27,5 @@ index 2c5e1f293..28e76f2a7 100644
      }
    }
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0010-Remove-containerd-configuration-for-hosts.toml-paths.patch b/projects/kubernetes-sigs/image-builder/patches/0010-Remove-containerd-configuration-for-hosts.toml-paths.patch
@@ -1,7 +1,7 @@
-From 4657712fc9c051a324032348bf812ad68b799edd Mon Sep 17 00:00:00 2001
+From 686f27f3efdb3b898e0a3cb86eeb0fff2808f7c7 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 19 Sep 2024 16:04:19 -0700
-Subject: [PATCH 10/19] Remove containerd configuration for hosts.toml paths
+Subject: [PATCH 10/18] Remove containerd configuration for hosts.toml paths
 
 In EKS Anywhere, we're still using the older containerd config template (v2), so setting the
 config_path in the containerd config file causes errors like "invalid plugin config: `mirrors`
@@ -45,5 +45,5 @@ index 2625d6e58..cc31ee17e 100644
    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
      runtime_type = "io.containerd.runc.v2"
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0011-Revert-updating-preseed-and-cloud-init-to-use-CD-for.patch b/projects/kubernetes-sigs/image-builder/patches/0011-Revert-updating-preseed-and-cloud-init-to-use-CD-for.patch
@@ -1,7 +1,7 @@
-From a9ec51dd1017d22a78520e8f041a4af0ba93868f Mon Sep 17 00:00:00 2001
+From ecf62af96806add605edd1f1740f3a9c28410c7b Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 19 Sep 2024 18:52:00 -0700
-Subject: [PATCH 11/19] Revert updating preseed and cloud-init to use CD for
+Subject: [PATCH 11/18] Revert updating preseed and cloud-init to use CD for
  boot files
 
 We are reverting the upstream change that updated preseed and cloud-init scripts
@@ -173,5 +173,5 @@ index 80867cc7f..1a153d9e8 100755
  if [ -n "${BOSKOS_HOST:-}" ]; then
    # Check out the account from Boskos and store the produced environment
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0012-Make-configurable-Nutanix-image-size.patch b/projects/kubernetes-sigs/image-builder/patches/0012-Make-configurable-Nutanix-image-size.patch
@@ -1,7 +1,7 @@
-From 8d508bf57a741087579c3f46eb9f54829905a4c8 Mon Sep 17 00:00:00 2001
+From 7925135ae56605aeedf256f1cefb67a45f5d0ce4 Mon Sep 17 00:00:00 2001
 From: Ilya Alekseyev <ilya.alekseyev@nutanix.com>
 Date: Tue, 11 Feb 2025 14:19:12 +0000
-Subject: [PATCH 12/19] Make configurable Nutanix image size
+Subject: [PATCH 12/18] Make configurable Nutanix image size
 
 ---
  images/capi/packer/nutanix/packer-windows.json | 2 +-
@@ -35,5 +35,5 @@ index bffdf23f7..0353122c8 100644
      "force_deregister": "true",
      "image_delete": "false",
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0013-Add-non-EFI-builds-for-RHEL-9-OVA.patch b/projects/kubernetes-sigs/image-builder/patches/0013-Add-non-EFI-builds-for-RHEL-9-OVA.patch
@@ -1,7 +1,7 @@
-From ccce00dbca1a6df3790ae7b207427aa664161290 Mon Sep 17 00:00:00 2001
+From c633c2a519e789411a726bd1eddba29bd419d526 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 13 Mar 2025 12:11:42 -0700
-Subject: [PATCH 13/19] Add non-EFI builds for RHEL 9 OVA
+Subject: [PATCH 13/18] Add non-EFI builds for RHEL 9 OVA
 
 RHEL 9 OVA builds were defaulted to EFI upstream with no direct to override the firmware to BIOS. So we
 are splitting the builds into BIOS and EFI builds so that customers can choose the firmware option based
@@ -204,5 +204,5 @@ index 0b806d1a8..91e351f1a 100644
    "http_directory": "./packer/ova/linux/{{user `distro_name`}}/http/",
    "iso_checksum": "398561d7b66f1a4bf23664f4aa8f2cfbb3641aa2f01a320068e86bd1fc0e9076",
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0014-Use-rhsm_server_release_version-as-releasever.patch b/projects/kubernetes-sigs/image-builder/patches/0014-Use-rhsm_server_release_version-as-releasever.patch
@@ -1,7 +1,7 @@
-From b611e1e11a5cabf22ede1fc66c24e93847881430 Mon Sep 17 00:00:00 2001
+From e2e9669c95b749b44b97b46c82586ab0edbf0170 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Fri, 12 Sep 2025 14:28:13 -0700
-Subject: [PATCH 14/19] Use rhsm_server_release_version as releasever
+Subject: [PATCH 14/18] Use rhsm_server_release_version as releasever
 
 Currently image-builder does a yum update during sys prep,
 this will always update the OS kernel version to latest,
@@ -45,5 +45,5 @@ index d9240c4df..2356927b9 100644
  - name: Install baseline dependencies
    ansible.builtin.yum:
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0015-Vsphere-Clone-Builder-support.patch b/projects/kubernetes-sigs/image-builder/patches/0015-Vsphere-Clone-Builder-support.patch
@@ -1,7 +1,7 @@
-From 13525e818ce115b2c79558d8abfec7a1acaaf493 Mon Sep 17 00:00:00 2001
+From c956dbfc50e853ae1e1a2390f19016e77d01b145 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Wed, 1 Oct 2025 17:54:37 -0700
-Subject: [PATCH 15/19] Vsphere Clone Builder support
+Subject: [PATCH 15/18] Vsphere Clone Builder support
 
 1. Add tasks to disable firewall service on Rhel and Ubuntu.
 If base template has firewall enabled, it will block certain
@@ -48,5 +48,5 @@ index 2356927b9..67e24e1b0 100644
 +  ignore_errors: yes
 +  when: ansible_service_mgr == "systemd"
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0016-Add-patch-to-support-Ubuntu-20.04-builds.patch b/projects/kubernetes-sigs/image-builder/patches/0016-Add-patch-to-support-Ubuntu-20.04-builds.patch
@@ -1,7 +1,7 @@
-From f7cf8b1950365f6cdc7b8bbb400120d4e9d7f82d Mon Sep 17 00:00:00 2001
+From 0487f5421b7002e6b0f1dec12a816b8456057f94 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Fri, 23 Jan 2026 20:16:04 -0800
-Subject: [PATCH 16/19] Add patch to support Ubuntu 20.04 builds
+Subject: [PATCH 16/18] Add patch to support Ubuntu 20.04 builds
 
 Support Ubuntu 20.04 build for Nutanix, Raw, OVA
 AMI and QEMU.
@@ -390,5 +390,5 @@ index 000000000..6e4516fb5
 +}
 \ No newline at end of file
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0017-Fix-containerd-sha256-checksum-url.patch b/projects/kubernetes-sigs/image-builder/patches/0017-Fix-containerd-sha256-checksum-url.patch
@@ -1,7 +1,7 @@
-From 8ae917d25e6dd38aead118be1bf0671073992892 Mon Sep 17 00:00:00 2001
+From 041027724a7f3b36f8384ab57e2385c4ea796013 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Tue, 3 Feb 2026 20:22:53 -0800
-Subject: [PATCH 18/19] Fix containerd sha256 checksum url
+Subject: [PATCH 17/18] Fix containerd sha256 checksum url
 
 (1) Use containerd_sha256 value for containerd checksum.
 (2) Containerd files should be unpack from root directory
@@ -50,5 +50,5 @@ index 465337235..f1ca3e925 100644
  
  - name: Remove Kubernetes images
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 
diff --git a/projects/kubernetes-sigs/image-builder/patches/0017-set-failCGroupv1-to-false.patch b/projects/kubernetes-sigs/image-builder/patches/0017-set-failCGroupv1-to-false.patch
diff --git a/projects/kubernetes-sigs/image-builder/patches/0018-Change-ova-partition-type-back-to-ext4.patch b/projects/kubernetes-sigs/image-builder/patches/0018-Change-ova-partition-type-back-to-ext4.patch
@@ -1,7 +1,7 @@
-From 57beaf336b46569c7ce0cd22e070e40a20960722 Mon Sep 17 00:00:00 2001
+From fc60aba05c1686d31ecc82ef1fe478347c688a39 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Mon, 9 Feb 2026 11:27:01 -0800
-Subject: [PATCH 19/19] Change ova partition type back to ext4
+Subject: [PATCH 18/18] Change ova partition type back to ext4
 
 Temporarily revert the change of ova partition type
 back to ext4.
@@ -67,5 +67,5 @@ index 3e91ea071..5582f2df5 100644
        - type: mount
          id: mount-0
 -- 
-2.45.2
+2.50.1 (Apple Git-155)
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-From debaa7b8be150c00fabb288616d864159b3756c8 Mon Sep 17 00:00:00 2001`
	`1`	`+From 20a289f8a52a0a9d98ba120d1e66de2a698c1578 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Abhay Krishna Arunachalam <arnchlm@amazon.com>`
`3`	`3`	`Date: Thu, 19 Sep 2024 15:36:00 -0700`
`4`		`-Subject: [PATCH 09/19] Pin Packer Goss plugin version to 3.1.4`
	`4`	`+Subject: [PATCH 09/18] Pin Packer Goss plugin version to 3.1.4`
`5`	`5`
`6`	`6`	`Upstream image-builder moved from installing packer-provisioner-goss through a script to installing it`
`7`	`7`	`via Packer config (https://github.com/kubernetes-sigs/image-builder/commit/c0b70ae37c4aac14c156fc7b907a9b35147757df).`
`@@ -27,5 +27,5 @@ index 2c5e1f293..28e76f2a7 100644`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`--`
`30`		`-2.45.2`
	`30`	`+2.50.1 (Apple Git-155)`
`31`	`31`