Image Builder support for RHEL 9 raw builds

UPSTREAM_PROJECTS.yaml

@@ -195,7 +195,7 @@ projects:
             go_version: "1.19"
       - name: image-builder
         versions:
-          - tag: v0.1.25
+          - commit: a216372fe9f91ac6f8fd5b0d733e979d70845b73
             go_version: N/A
       - name: kind
         versions:

projects/kubernetes-sigs/image-builder/GIT_TAG

@@ -1 +1 @@
-v0.1.25
+a216372fe9f91ac6f8fd5b0d733e979d70845b73

projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch

@@ -1,7 +1,7 @@
-From 14e9850d7760f5c0d94d74cab875c6abf110607e Mon Sep 17 00:00:00 2001
+From 5f1383433d868718bb8c8ba35901a208095e55cd Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Tue, 11 Jan 2022 21:05:13 -0800
-Subject: [PATCH 01/11] OVA improvements
+Subject: [PATCH 01/10] OVA improvements
 
 - Create /etc/pki/tls/certs dir as part of image-builds
 - Tweak Product info in OVF

projects/kubernetes-sigs/image-builder/patches/0002-EKS-D-support-and-changes.patch

@@ -1,7 +1,7 @@
-From bc6fd9449092348f1db3a9c1088860602e515858 Mon Sep 17 00:00:00 2001
+From 982208f029211d74bf3b1f3dfe358d718fad032a Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Tue, 11 Jan 2022 18:36:56 -0800
-Subject: [PATCH 02/11] EKS-D support and changes
+Subject: [PATCH 02/10] EKS-D support and changes
 
 - Add goss validations for EKS-D artifacts
 - Add etcdadm and etcd.tar.gz to image for unstacked etcd support
@@ -300,10 +300,10 @@ index 8c201c17d..e17436a9d 100644
        "version": "{{user `goss_version`}}"
      }
 diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json
-index 152041455..a04be4e8f 100644
+index 1d52a5f98..29a3b34c2 100644
 --- a/images/capi/packer/raw/packer.json
 +++ b/images/capi/packer/raw/packer.json
-@@ -126,7 +126,12 @@
+@@ -127,7 +127,12 @@
          "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}",
          "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0  }}",
          "kubernetes_source_type": "{{user `kubernetes_source_type`}}",

projects/kubernetes-sigs/image-builder/patches/0003-Snow-AMI-support.patch

@@ -1,12 +1,13 @@
-From b9a9b17dcba15e4f7bcfcd0172b6d024e2f5c901 Mon Sep 17 00:00:00 2001
+From 5fe6946f056ce99f9d9288fc18a46ab6a04fd569 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <[email protected]>
 Date: Thu, 2 Feb 2023 01:39:15 -0800
-Subject: [PATCH 03/11] Snow AMI support
+Subject: [PATCH 03/10] Snow AMI support
 
 - Add instance metadata options to Packer config
 - Rename Snow node image to reflect appropriate CAPI provider
 
 Signed-off-by: Abhay Krishna Arunachalam <[email protected]>
+Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---
  images/capi/packer/ami/packer.json | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)

projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch

@@ -1,12 +1,14 @@
-From c28ee4073c2b8e16d3fad66edb4ce45d154c2aee Mon Sep 17 00:00:00 2001
+From 3845b201d6632b2642ab2390bc028635a864409f Mon Sep 17 00:00:00 2001
 From: Jackson West <[email protected]>
 Date: Fri, 23 Jun 2023 10:50:08 -0500
-Subject: [PATCH 04/11] Ubuntu 22 support and improvements
+Subject: [PATCH 04/10] Ubuntu 22 support and improvements
 
 - uses latest ubuntu 22.04 iso
 - adds support for raw ubuntu 22.04 builds
 - Ubuntu switch to offline-install when mirrors are unavailable
 - sets OS_VERSION for goss validation on raw image builds
+
+Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---
  images/capi/Makefile                          |   6 +-
  .../raw/linux/ubuntu/http/22.04.efi/meta-data |   0
@@ -27,28 +29,28 @@ Subject: [PATCH 04/11] Ubuntu 22 support and improvements
  create mode 100644 images/capi/packer/raw/raw-ubuntu-2204.json
 
 diff --git a/images/capi/Makefile b/images/capi/Makefile
-index d602b2860..d555c304f 100644
+index d008d81a6..e9c0e28b4 100644
 --- a/images/capi/Makefile
 +++ b/images/capi/Makefile
 @@ -372,7 +372,7 @@ QEMU_BUILD_NAMES			?=	qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2304 qemu-ub
 
  QEMU_KUBEVIRT_BUILD_NAMES	:= $(addprefix kubevirt-,$(QEMU_BUILD_NAMES))
 
--RAW_BUILD_NAMES				?=      raw-ubuntu-2004 raw-ubuntu-2004-efi raw-flatcar raw-rhel-8
-+RAW_BUILD_NAMES				?=      raw-ubuntu-2004 raw-ubuntu-2004-efi raw-ubuntu-2204 raw-ubuntu-2204-efi raw-flatcar raw-rhel-8
+-RAW_BUILD_NAMES				?=      raw-ubuntu-2004 raw-ubuntu-2004-efi raw-flatcar raw-rhel-8 raw-rhel-9 raw-rhel-9-efi
++RAW_BUILD_NAMES				?=      raw-ubuntu-2004 raw-ubuntu-2004-efi raw-flatcar raw-rhel-8 raw-rhel-9 raw-rhel-9-efi raw-ubuntu-2204 raw-ubuntu-2204-efi
  VBOX_BUILD_NAMES			?=      vbox-windows-2019
 
  POWERVS_BUILD_NAMES         ?= powervs-centos-8
-@@ -783,6 +783,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images
+@@ -784,6 +784,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images
  build-raw-flatcar: ## Builds Flatcar RAW image
  build-raw-ubuntu-2004: ## Builds Ubuntu 20.04 RAW image
  build-raw-ubuntu-2004-efi: ## Builds Ubuntu 20.04 RAW image that EFI boots
 +build-raw-ubuntu-2204: ## Builds Ubuntu 22.04 RAW image
 +build-raw-ubuntu-2204-efi: ## Builds Ubuntu 22.04 RAW image that EFI boots
  build-raw-rhel-8: ## Builds RHEL 8 RAW image
- build-raw-all: $(RAW_BUILD_TARGETS) ## Builds all RAW images
-
-@@ -924,6 +926,8 @@ validate-qemu-all: $(QEMU_VALIDATE_TARGETS) ## Validates all Qemu Packer config
+ build-raw-rhel-9: ## Builds RHEL 9 RAW image
+ build-raw-rhel-9-efi: ## Builds RHEL 9 RAW image that EFI boots
+@@ -928,6 +930,8 @@ validate-qemu-all: $(QEMU_VALIDATE_TARGETS) ## Validates all Qemu Packer config
  validate-raw-flatcar: ## Validates Flatcar RAW image packer config
  validate-raw-ubuntu-2004: ## Validates Ubuntu 20.04 RAW image packer config
  validate-raw-ubuntu-2004-efi: ## Validates Ubuntu 20.04 RAW EFI image packer config
@@ -285,10 +287,10 @@ index 000000000..a5ed32346
 +    - curtin in-target --target=/target -- apt-get clean
 +    - curtin in-target --target=/target -- rm -rf /var/lib/apt/lists/*
 diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json
-index a04be4e8f..83aa6b4fb 100644
+index 29a3b34c2..3b61117df 100644
 --- a/images/capi/packer/raw/packer.json
 +++ b/images/capi/packer/raw/packer.json
-@@ -117,6 +117,7 @@
+@@ -118,6 +118,7 @@
        "vars_inline": {
          "ARCH": "amd64",
          "OS": "{{user `distro_name` | lower}}",

projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch

@@ -1,7 +1,7 @@
-From f2554944f1a5d5a7a7c4aa12620d0791a881b251 Mon Sep 17 00:00:00 2001
+From 1ba45327727803fc3671c6aa8fc5de6e3db64dbe Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Tue, 6 Dec 2022 15:42:02 -0600
-Subject: [PATCH 05/11] RHEL support and improvements
+Subject: [PATCH 05/10] RHEL support and improvements
 
 - Exclude kernel and cloud-init from yum updates
 - Patch cloud-init systemd unit to wait for network manager online

projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch

@@ -1,8 +1,9 @@
-From 57a9bd7e2fe46db5ca7eb3497c46688df7d8031f Mon Sep 17 00:00:00 2001
+From e377d1169743d9b6add30647089952af7f15f454 Mon Sep 17 00:00:00 2001
 From: Ilya Alekseyev <[email protected]>
 Date: Wed, 11 Oct 2023 22:07:22 -0400
-Subject: [PATCH 06/11] Nutanix RHEL support for AWS image-builder
+Subject: [PATCH 06/10] Nutanix RHEL support for AWS image-builder
 
+Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---
  images/capi/packer/nutanix/packer.json | 1 +
  images/capi/packer/nutanix/rhel-8.json | 1 -

projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch

@@ -1,8 +1,9 @@
-From 22c529a865c4ac61ec7e5bd4607f506ca7dd77be Mon Sep 17 00:00:00 2001
+From 60a769679234b52bde6dca826215c408ba14677c Mon Sep 17 00:00:00 2001
 From: Prow Bot <[email protected]>
 Date: Mon, 21 Aug 2023 18:40:07 -0500
-Subject: [PATCH 07/11] adds retries and timeout to packer image-builder
+Subject: [PATCH 07/10] adds retries and timeout to packer image-builder
 
+Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---
  images/capi/packer/ami/packer.json        |  2 ++
  images/capi/packer/ova/packer-common.json |  3 ++-
@@ -166,10 +167,10 @@ index e17436a9d..e2fecf369 100644
        "user": "builder"
      },
 diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json
-index 83aa6b4fb..3b75d291a 100644
+index 3b61117df..29d18badd 100644
 --- a/images/capi/packer/raw/packer.json
 +++ b/images/capi/packer/raw/packer.json
-@@ -24,8 +24,9 @@
+@@ -25,8 +25,9 @@
        "output_directory": "{{user `output_directory`}}",
        "qemu_binary": "{{user `qemu_binary`}}",
        "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'usermod -L {{user `ssh_username`}} && {{user `shutdown_command`}}'",
@@ -180,7 +181,7 @@ index 83aa6b4fb..3b75d291a 100644
        "ssh_username": "{{user `ssh_username`}}",
        "type": "qemu",
        "vm_name": "{{user `vm_name`}}"
-@@ -71,7 +72,9 @@
+@@ -72,7 +73,9 @@
          "--scp-extra-args",
          "{{user `ansible_scp_extra_args`}}"
        ],
@@ -190,7 +191,7 @@ index 83aa6b4fb..3b75d291a 100644
        "type": "ansible",
        "user": "builder"
      },
-@@ -97,7 +100,9 @@
+@@ -98,7 +101,9 @@
          "--scp-extra-args",
          "{{user `ansible_scp_extra_args`}}"
        ],

projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch

@@ -1,7 +1,7 @@
-From 93c1cf81631f007a067895b9ab7c1ae46cb33539 Mon Sep 17 00:00:00 2001
+From 4efa95944cf210a507bcfb36121f743ccb95cea6 Mon Sep 17 00:00:00 2001
 From: Taylor Neyland <[email protected]>
 Date: Wed, 19 Jul 2023 12:51:30 -0500
-Subject: [PATCH 08/11] Disable UDP offload service for Redhat and Ubuntu
+Subject: [PATCH 08/10] Disable UDP offload service for Redhat and Ubuntu
 
 Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---

projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch

@@ -1,7 +1,7 @@
-From d352d5031e6ac066b9a70774ffbc8f1b68f2a3e1 Mon Sep 17 00:00:00 2001
+From 1b8d2faa3ab0039e86230ff69bcc5eb877748af5 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Wed, 20 Sep 2023 10:33:44 -0500
-Subject: [PATCH 09/11] Default Flatcar version to avoid pulling from internet
+Subject: [PATCH 09/10] Default Flatcar version to avoid pulling from internet
  on every make
 
 Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
@@ -10,7 +10,7 @@ Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/images/capi/Makefile b/images/capi/Makefile
-index d555c304f..36fd00592 100644
+index e9c0e28b4..6e237588d 100644
 --- a/images/capi/Makefile
 +++ b/images/capi/Makefile
 @@ -325,7 +325,7 @@ WINDOWS_VERSIONS		:=	windows-2019 windows-2019-efi windows-2022 windows-2022-efi

projects/kubernetes-sigs/image-builder/patches/0011-Revert-updates-to-Ubuntu-2004-ISO-URLs.patch → projects/kubernetes-sigs/image-builder/patches/0010-Revert-updates-to-Ubuntu-2004-ISO-URLs.patch

@@ -1,9 +1,10 @@
-From 488b43cfd876bd2a61d5c8a4a2ebe60f5590f09a Mon Sep 17 00:00:00 2001
+From d1751390adb1530c95104b886653b28d7d3fe061 Mon Sep 17 00:00:00 2001
 From: Prow Bot <[email protected]>
 Date: Sun, 17 Mar 2024 23:51:54 -0700
-Subject: [PATCH 11/11] Revert updates to Ubuntu 2004 ISO URLs
+Subject: [PATCH 10/10] Revert updates to Ubuntu 2004 ISO URLs
 
 Signed-off-by: Abhay Krishna Arunachalam <[email protected]>
+Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---
  images/capi/packer/qemu/qemu-ubuntu-2004-efi.json | 4 ++--
  images/capi/packer/qemu/qemu-ubuntu-2004.json     | 4 ++--