Update Git tag and patches for kubernetes-sigs/image-builder

aws · Sep 19, 2024 · 3ac4b48 · 3ac4b48
1 parent 91cec5e
commit 3ac4b48
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 135 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -201,7 +201,7 @@ projects:
             go_version: "1.19"
       - name: image-builder
         versions:
-          - tag: v0.1.34
+          - tag: v0.1.35
             go_version: N/A
       - name: kind
         versions:

diff --git a/projects/kubernetes-sigs/image-builder/GIT_TAG b/projects/kubernetes-sigs/image-builder/GIT_TAG
@@ -1 +1 @@
-v0.1.34
+v0.1.35
diff --git a/projects/kubernetes-sigs/image-builder/README.md b/projects/kubernetes-sigs/image-builder/README.md
@@ -1,5 +1,5 @@
 ## **Image Builder**
-![Version](https://img.shields.io/badge/version-v0.1.34-blue)
+![Version](https://img.shields.io/badge/version-v0.1.35-blue)
 | Kubernetes Version | Ubuntu 2004 | Ubuntu 2204 | RHEL 8 | RHEL 9 | Bottlerocket |
 | --- | --- | --- | --- | --- | --- |
 | 1-26 OVA | ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiNHlZUlIya0swSDQ2L0g3TGxTVFFCRGtEZlp2TWx1OXhwVXhZVUNOVDNGazZpK2EyUDdlQzloQ2lYaTIyWVpvNGN0VzJaM2RIQi9qYWxlaWtaampacXdJPSIsIml2UGFyYW1ldGVyU3BlYyI6Ik84cjNXME9aUGE5Sm5ucUkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) | ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiT3hiT2NyTWc3R01qZVlLMkgzcHFySXJGQ3liODdPRFlHdXBhdmtxbG9QbFhGQXcrWnB0WDU4aENVTlliODN2aDFpYXhjS0FjRWhJY0p5dWtyU3duTGVBPSIsIml2UGFyYW1ldGVyU3BlYyI6ImZsTGJmcm1VUXJHcGVQNUMiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) | ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicWtnQjRoWURiTUsvOWZVcVNhKytuWFY1emhBRnJTbEF2RXFFT3JoRWRzRlVzZTRJNWg4VDRoM3REQXBRbSttMVltblQxQjVKRGJEMVFqb0ZsVkJhNUJFPSIsIml2UGFyYW1ldGVyU3BlYyI6IlZSSUF1WXQzdEhPU0ZlQzYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) | | ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicWhVbUt4VXlQVjhGMjN3MmtZTTV3R0NVWUZEQmRYbE51RlBRQUZPektLaTI5N0wvK3k1UUt2WEhVVldvRzlKTkxFTGtpNkhaUXRMZ0RaUjRQWDRVR0EwPSIsIml2UGFyYW1ldGVyU3BlYyI6InlOR3hJbktWMFZJMjlHMWciLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) |

diff --git a/projects/kubernetes-sigs/image-builder/build/update_required_deps.sh b/projects/kubernetes-sigs/image-builder/build/update_required_deps.sh
@@ -32,14 +32,14 @@ MINIMUM_PYTHON_VERSION="$($SED -n "s/^minimum_python_version=\(\S*\)/\1/p" $IMAG
 ANSIBLE_VERSION="$($SED -n "s/^_version=\"\(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/hack/ensure-ansible.sh)"
 
 PACKER_VERSION="$($SED -n "s/^_version=\"\(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/hack/ensure-packer.sh)"
-GOSS_VERSION="$($SED -n "s/^_version=\"\(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/hack/ensure-goss.sh)"
 
-PACKER_PLUGIN_ANSIBLE="$($SED -n "s/^\s*version = \">= \(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/packer/config.pkr.hcl)"
-PACKER_PLUGIN_NUTANIX="$($SED -n "s/^\s*version = \">= \(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/packer/nutanix/config.pkr.hcl)"
+PACKER_PLUGIN_ANSIBLE_VERSION="$($SED -n "s/^\s*version = \">= \(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/packer/config.pkr.hcl)"
+PACKER_PROVISIONER_GOSS_VERSION="$($SED -n "s/^\s*version = \"~> \(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/packer/config.pkr.hcl)"
+PACKER_PLUGIN_NUTANIX_VERSION="$($SED -n "s/^\s*version = \">= \(\S*\)\"/\1/p" $IMAGE_BUILDER_DIR/packer/nutanix/config.pkr.hcl)"
 
 rm $DEPENDENCY_YAML
 
-yq e ".packer={\"version\":\"$PACKER_VERSION\",\"plugins\":{\"ansible\":\"$PACKER_PLUGIN_ANSIBLE\",\"goss\":\"$GOSS_VERSION\",\"nutanix\":\"$PACKER_PLUGIN_NUTANIX\"}}" $DEPENDENCY_YAML > $DEPENDENCY_YAML
+yq e ".packer={\"version\":\"$PACKER_VERSION\",\"plugins\":{\"ansible\":\"$PACKER_PLUGIN_ANSIBLE_VERSION\",\"goss\":\"$PACKER_PROVISIONER_GOSS_VERSION\",\"nutanix\":\"$PACKER_PLUGIN_NUTANIX_VERSION\"}}" $DEPENDENCY_YAML > $DEPENDENCY_YAML
 echo "ansible: $ANSIBLE_VERSION" >> $DEPENDENCY_YAML
 echo "python: $MINIMUM_PYTHON_VERSION" >> $DEPENDENCY_YAML
 

diff --git a/projects/kubernetes-sigs/image-builder/build/validate_required_deps.sh b/projects/kubernetes-sigs/image-builder/build/validate_required_deps.sh
@@ -27,8 +27,6 @@ IMAGE_FORMAT="$1"
 DEPENDENCY_YAML=$MAKE_ROOT/REQUIRED_DEPENDENCY_VERSIONS.yaml
 
 # python 3.9+ is already checked in upstream image-builder's ensure-python.sh
-# the goss binary's shasum is compared in upstream image-builder's ensure-goss.sh and if its 
-#  not the expected it is redownlaoded
 
 echo -e "\n\n************************************************"
 echo "The following are key dependencies and their current versions"

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,4 +1,4 @@
-From fee1ec598f39c164271fb3435fe2a4bdfd0758be Mon Sep 17 00:00:00 2001
+From 46c159cfc3e9bff02ad01eb57a02ada35c00a236 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 1/9] OVA improvements
@@ -61,10 +61,10 @@ index 316427ec3..ca23db5f9 100644
        <Property ovf:userConfigurable="false" ovf:value="${BUILD_TIMESTAMP}" ovf:type="string" ovf:key="BUILD_TIMESTAMP"/>
        <Property ovf:userConfigurable="false" ovf:value="${BUILD_DATE}" ovf:type="string" ovf:key="BUILD_DATE"/>
 diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json
-index 46e1b3a3a..c9ede60bd 100644
+index 96f389d61..34e1f80b8 100644
 --- a/images/capi/packer/ova/packer-node.json
 +++ b/images/capi/packer/ova/packer-node.json
-@@ -478,7 +478,7 @@
+@@ -482,7 +482,7 @@
      "crictl_url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-amd64.tar.gz",
      "crictl_version": null,
      "datastore": "",

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,4 +1,4 @@
-From 0f638ec1810420ebda7a00d606d97420629a721d Mon Sep 17 00:00:00 2001
+From 20454713313ec949a5b20414959c8d5ff08a45f9 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 2/9] EKS-D support and changes
@@ -140,13 +140,13 @@ index fd93b29d6..435797c65 100644
    "ansible_scp_extra_args": "{{env `ANSIBLE_SCP_EXTRA_ARGS`}}"
  }
 diff --git a/images/capi/packer/config/kubernetes.json b/images/capi/packer/config/kubernetes.json
-index b15ca8ab5..e6111f561 100644
+index e6ae7e3d9..ff84c58aa 100644
 --- a/images/capi/packer/config/kubernetes.json
 +++ b/images/capi/packer/config/kubernetes.json
 @@ -4,6 +4,9 @@
    "crictl_source_type": "pkg",
    "crictl_url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-{{user `crictl_arch`}}.tar.gz",
-   "crictl_version": "1.28.0",
+   "crictl_version": "1.29.0",
 +  "etcd_http_source":"",
 +  "etcd_version":"",
 +  "etcdadm_http_source":"",
@@ -156,10 +156,10 @@ index b15ca8ab5..e6111f561 100644
 @@ -18,6 +21,7 @@
    "kubernetes_rpm_repo": "https://pkgs.k8s.io/core:/stable:/{{ user `kubernetes_series` }}/rpm/",
    "kubernetes_rpm_repo_arch": "x86_64",
-   "kubernetes_rpm_version": "1.28.9",
-+  "kubernetes_full_version": "v1.28.9",
-   "kubernetes_semver": "v1.28.9",
-   "kubernetes_series": "v1.28",
+   "kubernetes_rpm_version": "1.29.7",
++  "kubernetes_full_version": "v1.29.7",
+   "kubernetes_semver": "v1.29.7",
+   "kubernetes_series": "v1.29",
    "kubernetes_source_type": "pkg",
 diff --git a/images/capi/packer/goss/goss-command.yaml b/images/capi/packer/goss/goss-command.yaml
 index aa2179c6d..36cebb4b3 100644
@@ -264,10 +264,10 @@ index 959005df8..2d88c2fb6 100644
        "version": "{{user `goss_version`}}"
      }
 diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json
-index c9ede60bd..d95c44a3c 100644
+index 34e1f80b8..833b1cfae 100644
 --- a/images/capi/packer/ova/packer-node.json
 +++ b/images/capi/packer/ova/packer-node.json
-@@ -454,6 +454,11 @@
+@@ -456,6 +456,11 @@
          "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0  }}",
          "kubernetes_source_type": "{{user `kubernetes_source_type`}}",
          "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}",
@@ -280,10 +280,10 @@ index c9ede60bd..d95c44a3c 100644
        },
        "version": "{{user `goss_version`}}"
 diff --git a/images/capi/packer/qemu/packer.json b/images/capi/packer/qemu/packer.json
-index 8c201c17d..e17436a9d 100644
+index e261a2a8a..f105863f8 100644
 --- a/images/capi/packer/qemu/packer.json
 +++ b/images/capi/packer/qemu/packer.json
-@@ -142,7 +142,12 @@
+@@ -148,7 +148,12 @@
          "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}",
          "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0  }}",
          "kubernetes_source_type": "{{user `kubernetes_source_type`}}",

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,4 +1,4 @@
-From f8a4415c676b1289092ed10f8151288178fdc7d0 Mon Sep 17 00:00:00 2001
+From 36a702e1b77fca244e6ee3bcf56658f5845a1ba4 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 3/9] Snow AMI support

diff --git a/...ts/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22.04-support-and-improvements.patch b/...ts/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22.04-support-and-improvements.patch
@@ -1,4 +1,4 @@
-From eba35ef79315a9b19e4eb8b6bc7d53bf91404456 Mon Sep 17 00:00:00 2001
+From 10d7be2ff6cd947c301f29ba5f0979ededf7614c Mon Sep 17 00:00:00 2001
 From: Jackson West <jgw@amazon.com>
 Date: Fri, 23 Jun 2023 10:50:08 -0500
 Subject: [PATCH 4/9] Ubuntu 22.04 support and improvements
@@ -11,11 +11,6 @@ Subject: [PATCH 4/9] Ubuntu 22.04 support and improvements
 Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
 ---
  images/capi/Makefile                          |   6 +-
- images/capi/packer/ova/ubuntu-2204-efi.json   |   4 +-
- images/capi/packer/ova/ubuntu-2204.json       |   4 +-
- images/capi/packer/proxmox/ubuntu-2204.json   |   4 +-
- .../packer/qemu/qemu-ubuntu-2204-efi.json     |   4 +-
- images/capi/packer/qemu/qemu-ubuntu-2204.json |   4 +-
  .../raw/linux/ubuntu/http/22.04.efi/meta-data |   0
  .../raw/linux/ubuntu/http/22.04.efi/user-data | 115 ++++++++++++++++++
  .../raw/linux/ubuntu/http/22.04/meta-data     |   0
@@ -25,7 +20,7 @@ Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
  images/capi/packer/raw/raw-ubuntu-2004.json   |   1 +
  .../capi/packer/raw/raw-ubuntu-2204-efi.json  |  14 +++
  images/capi/packer/raw/raw-ubuntu-2204.json   |  13 ++
- 15 files changed, 254 insertions(+), 11 deletions(-)
+ 10 files changed, 244 insertions(+), 1 deletion(-)
  create mode 100644 images/capi/packer/raw/linux/ubuntu/http/22.04.efi/meta-data
  create mode 100644 images/capi/packer/raw/linux/ubuntu/http/22.04.efi/user-data
  create mode 100644 images/capi/packer/raw/linux/ubuntu/http/22.04/meta-data
@@ -34,19 +29,19 @@ Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
  create mode 100644 images/capi/packer/raw/raw-ubuntu-2204.json
 
 diff --git a/images/capi/Makefile b/images/capi/Makefile
-index 143c83999..152d33da6 100644
+index 3388a5a9b..9afb51455 100644
 --- a/images/capi/Makefile
 +++ b/images/capi/Makefile
-@@ -366,7 +366,7 @@ QEMU_BUILD_NAMES			?=	qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2304 qemu-ub
+@@ -362,7 +362,7 @@ QEMU_BUILD_NAMES			?=	qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2204-cloudim
 
  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-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
 
- POWERVS_BUILD_NAMES         ?= powervs-centos-8
+ POWERVS_BUILD_NAMES         ?= powervs-centos-8 powervs-centos-9
 
-@@ -785,6 +785,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images
+@@ -805,6 +805,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
@@ -55,7 +50,7 @@ index 143c83999..152d33da6 100644
  build-raw-rhel-8: ## Builds RHEL 8 RAW image
  build-raw-rhel-9: ## Builds RHEL 9 RAW image
  build-raw-rhel-9-efi: ## Builds RHEL 9 RAW image that EFI boots
-@@ -948,6 +950,8 @@ validate-qemu-all: $(QEMU_VALIDATE_TARGETS) ## Validates all Qemu Packer config
+@@ -981,6 +983,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
@@ -64,86 +59,6 @@ index 143c83999..152d33da6 100644
  validate-raw-rhel-8: ## Validates RHEL 8 RAW image packer config
  validate-raw-all: $(RAW_VALIDATE_TARGETS) ## Validates all RAW Packer config
 
-diff --git a/images/capi/packer/ova/ubuntu-2204-efi.json b/images/capi/packer/ova/ubuntu-2204-efi.json
-index ffd4bf6c8..67ec60e7f 100644
---- a/images/capi/packer/ova/ubuntu-2204-efi.json
-+++ b/images/capi/packer/ova/ubuntu-2204-efi.json
-@@ -9,9 +9,9 @@
-   "firmware": "efi",
-   "floppy_dirs": "./packer/ova/linux/{{user `distro_name`}}/http/",
-   "guest_os_type": "ubuntu-64",
--  "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2",
-+  "iso_checksum": "9bc6028870aef3f74f4e16b900008179e78b130e6b0b9a140635434a46aa98b0",
-   "iso_checksum_type": "sha256",
--  "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso",
-+  "iso_url": "https://releases.ubuntu.com/22.04.5/ubuntu-22.04.5-live-server-amd64.iso",
-   "os_display_name": "Ubuntu 22.04",
-   "shutdown_command": "shutdown -P now",
-   "vsphere_guest_os_type": "ubuntu64Guest"
-diff --git a/images/capi/packer/ova/ubuntu-2204.json b/images/capi/packer/ova/ubuntu-2204.json
-index e436d93b9..7cadf0227 100644
---- a/images/capi/packer/ova/ubuntu-2204.json
-+++ b/images/capi/packer/ova/ubuntu-2204.json
-@@ -8,9 +8,9 @@
-   "distro_version": "22.04",
-   "floppy_dirs": "./packer/ova/linux/{{user `distro_name`}}/http/",
-   "guest_os_type": "ubuntu-64",
--  "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2",
-+  "iso_checksum": "9bc6028870aef3f74f4e16b900008179e78b130e6b0b9a140635434a46aa98b0",
-   "iso_checksum_type": "sha256",
--  "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso",
-+  "iso_url": "https://releases.ubuntu.com/22.04.5/ubuntu-22.04.5-live-server-amd64.iso",
-   "os_display_name": "Ubuntu 22.04",
-   "shutdown_command": "shutdown -P now",
-   "vsphere_guest_os_type": "ubuntu64Guest"
-diff --git a/images/capi/packer/proxmox/ubuntu-2204.json b/images/capi/packer/proxmox/ubuntu-2204.json
-index 78aacbb94..b604107c9 100644
---- a/images/capi/packer/proxmox/ubuntu-2204.json
-+++ b/images/capi/packer/proxmox/ubuntu-2204.json
-@@ -3,9 +3,9 @@
-   "build_name": "ubuntu-2204",
-   "distribution_version": "2204",
-   "distro_name": "ubuntu",
--  "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2",
-+  "iso_checksum": "9bc6028870aef3f74f4e16b900008179e78b130e6b0b9a140635434a46aa98b0",
-   "iso_checksum_type": "sha256",
--  "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso",
-+  "iso_url": "https://releases.ubuntu.com/22.04.5/ubuntu-22.04.5-live-server-amd64.iso",
-   "os_display_name": "Ubuntu 22.04",
-   "source_image": "ubuntu-20-04-x64",
-   "unmount_iso": "true",
-diff --git a/images/capi/packer/qemu/qemu-ubuntu-2204-efi.json b/images/capi/packer/qemu/qemu-ubuntu-2204-efi.json
-index cde3d1109..0ec98faaa 100644
---- a/images/capi/packer/qemu/qemu-ubuntu-2204-efi.json
-+++ b/images/capi/packer/qemu/qemu-ubuntu-2204-efi.json
-@@ -5,9 +5,9 @@
-   "firmware": "OVMF.fd",
-   "guest_os_type": "ubuntu-64",
-   "http_directory": "./packer/qemu/linux/ubuntu/http/22.04.efi.qemu",
--  "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2",
-+  "iso_checksum": "9bc6028870aef3f74f4e16b900008179e78b130e6b0b9a140635434a46aa98b0",
-   "iso_checksum_type": "sha256",
--  "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso",
-+  "iso_url": "https://releases.ubuntu.com/22.04.5/ubuntu-22.04.5-live-server-amd64.iso",
-   "os_display_name": "Ubuntu 22.04",
-   "shutdown_command": "shutdown -P now",
-   "unmount_iso": "true"
-diff --git a/images/capi/packer/qemu/qemu-ubuntu-2204.json b/images/capi/packer/qemu/qemu-ubuntu-2204.json
-index 9a114d361..3d6f350ac 100644
---- a/images/capi/packer/qemu/qemu-ubuntu-2204.json
-+++ b/images/capi/packer/qemu/qemu-ubuntu-2204.json
-@@ -4,9 +4,9 @@
-   "distribution_version": "2204",
-   "distro_name": "ubuntu",
-   "guest_os_type": "ubuntu-64",
--  "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2",
-+  "iso_checksum": "9bc6028870aef3f74f4e16b900008179e78b130e6b0b9a140635434a46aa98b0",
-   "iso_checksum_type": "sha256",
--  "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso",
-+  "iso_url": "https://releases.ubuntu.com/22.04.5/ubuntu-22.04.5-live-server-amd64.iso",
-   "os_display_name": "Ubuntu 22.04",
-   "shutdown_command": "shutdown -P now",
-   "unmount_iso": "true"
 diff --git a/images/capi/packer/raw/linux/ubuntu/http/22.04.efi/meta-data b/images/capi/packer/raw/linux/ubuntu/http/22.04.efi/meta-data
 new file mode 100644
 index 000000000..e69de29bb

diff --git a/projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch
@@ -1,4 +1,4 @@
-From bd7fc09cbc6563bf885da377742e0ac71b670fa5 Mon Sep 17 00:00:00 2001
+From 27b51efa17846a51228d18ffd90e0f80ce0db269 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 5/9] RHEL support and improvements

diff --git a/projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-improvements.patch
@@ -1,4 +1,4 @@
-From 3c12af557ea24248e2d645cd9894d97334a04e27 Mon Sep 17 00:00:00 2001
+From a5c819a928334a14e3f94f47a532d2aa844a0f20 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 6/9] Nutanix improvements