Change ova partition type back to ext4 (#5135)

2ez4szliu · web-flow · commit fb6ea0a8ff5e · 2026-02-10T03:31:32.000+05:30
xfs file type seems to break the post-build
kubelet validation for ubuntu 2204 and 2404 ova.

Reverting this change until we figure out why.
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: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Tue, 11 Jan 2022 21:05:13 -0800
-Subject: [PATCH 01/18] OVA improvements
+Subject: [PATCH 01/19] OVA improvements
 
 - Create /etc/pki/tls/certs dir as part of image-builds
 - Tweak Product info in OVF
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: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Tue, 11 Jan 2022 18:36:56 -0800
-Subject: [PATCH 02/18] EKS-D support and changes
+Subject: [PATCH 02/19] EKS-D support and changes
 
 - Add goss validations for EKS-D artifacts
 - Add etcdadm and etcd.tar.gz to image for unstacked etcd support
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: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 2 Feb 2023 01:39:15 -0800
-Subject: [PATCH 03/18] Snow AMI support
+Subject: [PATCH 03/19] Snow AMI support
 
 ---
  images/capi/packer/ami/packer.json | 12 ++++++++++--
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: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Tue, 6 Dec 2022 15:42:02 -0600
-Subject: [PATCH 04/18] RHEL support and improvements
+Subject: [PATCH 04/19] RHEL support and improvements
 
 - Fix redhat 9 cloud-init feature flags bug
 - Fix ensure iptables present for rhel
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: Ilya Alekseyev <ilya.alekseyev@nutanix.com>
 Date: Wed, 11 Oct 2023 22:07:22 -0400
-Subject: [PATCH 05/18] Nutanix improvements
+Subject: [PATCH 05/19] Nutanix improvements
 
 - Fetch Nutanix RHEL source image URL from environment
 - Force-delete Nutanix builder VMs on failure
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: Shizhao Liu <lshizhao@amazon.com>
 Date: Wed, 5 Nov 2025 14:02:23 -0800
-Subject: [PATCH 06/18] adds retries and timeout to packer image-builder
+Subject: [PATCH 06/19] 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.
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: Taylor Neyland <tneyla@amazon.com>
 Date: Wed, 19 Jul 2023 12:51:30 -0500
-Subject: [PATCH 07/18] Networking improvements
+Subject: [PATCH 07/19] Networking improvements
 
 - Disable UDP offload service for Redhat and Ubuntu
 - Default Flatcar version to avoid pulling from internet on every make
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: Shizhao Liu <lshizhao@amazon.com>
 Date: Mon, 19 Aug 2024 10:14:26 -0700
-Subject: [PATCH 08/18] Support and improvements for RHEL 9 EFI
+Subject: [PATCH 08/19] Support and improvements for RHEL 9 EFI
 
 1. Remove 2 unwanted partitions (the swap partition and /boot
 partition).
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: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 19 Sep 2024 15:36:00 -0700
-Subject: [PATCH 09/18] Pin Packer Goss plugin version to 3.1.4
+Subject: [PATCH 09/19] 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).
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: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 19 Sep 2024 16:04:19 -0700
-Subject: [PATCH 10/18] Remove containerd configuration for hosts.toml paths
+Subject: [PATCH 10/19] 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`
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: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 19 Sep 2024 18:52:00 -0700
-Subject: [PATCH 11/18] Revert updating preseed and cloud-init to use CD for
+Subject: [PATCH 11/19] 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
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: Ilya Alekseyev <ilya.alekseyev@nutanix.com>
 Date: Tue, 11 Feb 2025 14:19:12 +0000
-Subject: [PATCH 12/18] Make configurable Nutanix image size
+Subject: [PATCH 12/19] Make configurable Nutanix image size
 
 ---
  images/capi/packer/nutanix/packer-windows.json | 2 +-
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: Abhay Krishna Arunachalam <arnchlm@amazon.com>
 Date: Thu, 13 Mar 2025 12:11:42 -0700
-Subject: [PATCH 13/18] Add non-EFI builds for RHEL 9 OVA
+Subject: [PATCH 13/19] 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
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: Shizhao Liu <lshizhao@amazon.com>
 Date: Fri, 12 Sep 2025 14:28:13 -0700
-Subject: [PATCH 14/18] Use rhsm_server_release_version as releasever
+Subject: [PATCH 14/19] 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,
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: Shizhao Liu <lshizhao@amazon.com>
 Date: Wed, 1 Oct 2025 17:54:37 -0700
-Subject: [PATCH 15/18] Vsphere Clone Builder support
+Subject: [PATCH 15/19] 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
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: Shizhao Liu <lshizhao@amazon.com>
 Date: Fri, 23 Jan 2026 20:16:04 -0800
-Subject: [PATCH 16/18] Add patch to support Ubuntu 20.04 builds
+Subject: [PATCH 16/19] Add patch to support Ubuntu 20.04 builds
 
 Support Ubuntu 20.04 build for Nutanix, Raw, OVA
 AMI and QEMU.
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
@@ -1,7 +1,7 @@
 From 6bdbcedf0d5aa79c39a7c5e8291e9aca70220342 Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <lshizhao@amazon.com>
 Date: Fri, 23 Jan 2026 18:56:26 -0800
-Subject: [PATCH 17/18] set failCGroupv1 to false
+Subject: [PATCH 17/19] set failCGroupv1 to false
 
 k8s 1.35 will disable support for cgroup, but since we will
 still allow building images that uses cgroup v1, we set this
diff --git a/projects/kubernetes-sigs/image-builder/patches/0018-Fix-containerd-sha256-checksum-url.patch b/projects/kubernetes-sigs/image-builder/patches/0018-Fix-containerd-sha256-checksum-url.patch
@@ -1,7 +1,7 @@
 From 8ae917d25e6dd38aead118be1bf0671073992892 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/18] Fix containerd sha256 checksum url
+Subject: [PATCH 18/19] Fix containerd sha256 checksum url
 
 (1) Use containerd_sha256 value for containerd checksum.
 (2) Containerd files should be unpack from root directory
diff --git a/projects/kubernetes-sigs/image-builder/patches/0019-Change-partition-type-back-to-ext4.patch b/projects/kubernetes-sigs/image-builder/patches/0019-Change-partition-type-back-to-ext4.patch
@@ -0,0 +1,71 @@
+From 57beaf336b46569c7ce0cd22e070e40a20960722 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
+
+Temporarily revert the change of ova partition type
+back to ext4.
+
+Signed-off-by: Shizhao Liu <lshizhao@amazon.com>
+---
+ .../capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data.tmpl  | 2 +-
+ images/capi/packer/ova/linux/ubuntu/http/22.04/user-data.tmpl   | 2 +-
+ .../capi/packer/ova/linux/ubuntu/http/24.04.efi/user-data.tmpl  | 2 +-
+ images/capi/packer/ova/linux/ubuntu/http/24.04/user-data.tmpl   | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data.tmpl b/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data.tmpl
+index 8ee383fc9..a6c61f463 100644
+--- a/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data.tmpl
++++ b/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data.tmpl
+@@ -68,7 +68,7 @@ autoinstall:
+       grub_device: false
+       type: partition
+       id: partition-1
+-    - fstype: xfs
++    - fstype: ext4
+       volume: partition-1
+       preserve: false
+       type: format
+diff --git a/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data.tmpl b/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data.tmpl
+index 63331fb21..de47053e8 100644
+--- a/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data.tmpl
++++ b/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data.tmpl
+@@ -54,7 +54,7 @@ autoinstall:
+       - type: format
+         id: format-0
+         volume: partition-0
+-        fstype: xfs
++        fstype: ext4
+         preserve: false
+       - type: mount
+         id: mount-0
+diff --git a/images/capi/packer/ova/linux/ubuntu/http/24.04.efi/user-data.tmpl b/images/capi/packer/ova/linux/ubuntu/http/24.04.efi/user-data.tmpl
+index 37b67cf07..b579ea069 100644
+--- a/images/capi/packer/ova/linux/ubuntu/http/24.04.efi/user-data.tmpl
++++ b/images/capi/packer/ova/linux/ubuntu/http/24.04.efi/user-data.tmpl
+@@ -68,7 +68,7 @@ autoinstall:
+       grub_device: false
+       type: partition
+       id: partition-1
+-    - fstype: xfs
++    - fstype: ext4
+       volume: partition-1
+       preserve: false
+       type: format
+diff --git a/images/capi/packer/ova/linux/ubuntu/http/24.04/user-data.tmpl b/images/capi/packer/ova/linux/ubuntu/http/24.04/user-data.tmpl
+index 3e91ea071..5582f2df5 100644
+--- a/images/capi/packer/ova/linux/ubuntu/http/24.04/user-data.tmpl
++++ b/images/capi/packer/ova/linux/ubuntu/http/24.04/user-data.tmpl
+@@ -54,7 +54,7 @@ autoinstall:
+       - type: format
+         id: format-0
+         volume: partition-0
+-        fstype: xfs
++        fstype: ext4
+         preserve: false
+       - type: mount
+         id: mount-0
+-- 
+2.45.2
+
