[release-0.20] Bump kubernetes-sigs/image-builder to latest release (#…

…4103)

* Bump kubernetes-sigs/image-builder to latest release

* Update patches for kubernetes-sigs/image-builder

---------

Co-authored-by: Abhay Krishna Arunachalam <[email protected]>

UPSTREAM_PROJECTS.yaml

@@ -201,7 +201,7 @@ projects:
             go_version: "1.19"
       - name: image-builder
         versions:
-          - tag: v0.1.39
+          - tag: v0.1.40
             go_version: N/A
       - name: kind
         versions:

projects/kubernetes-sigs/image-builder/GIT_TAG

@@ -1 +1 @@
-v0.1.39
+v0.1.40

projects/kubernetes-sigs/image-builder/README.md

@@ -1,5 +1,5 @@
 ## **Image Builder**
-![Version](https://img.shields.io/badge/version-v0.1.39-blue)
+![Version](https://img.shields.io/badge/version-v0.1.40-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) |

projects/kubernetes-sigs/image-builder/REQUIRED_DEPENDENCY_VERSIONS.yaml

@@ -1,4 +1,4 @@
-ansible: 2.15.10
+ansible: 2.15.12
 packer:
   plugins:
     ansible: 1.1.0

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

@@ -1,4 +1,4 @@
-From 8e342fbd8e1dd4c9ef3eabd0b08e80b6a8388e1d Mon Sep 17 00:00:00 2001
+From 47bb85b2f73760e6f5f60f69edcb215575f0824b 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/13] OVA improvements

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

@@ -1,4 +1,4 @@
-From 9429abbf6cb7fa20d5718a7ac1457f079bdafece Mon Sep 17 00:00:00 2001
+From 1606bbfdf9fc2ef7abbf6c11d66f0ca1be9279fb 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/13] EKS-D support and changes
@@ -24,7 +24,7 @@ Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
  images/capi/packer/ova/packer-node.json       |  5 +++
  images/capi/packer/qemu/packer.json.tmpl      |  7 +++-
  images/capi/packer/raw/packer.json.tmpl       |  7 +++-
- 12 files changed, 101 insertions(+), 22 deletions(-)
+ 12 files changed, 102 insertions(+), 23 deletions(-)
 
 diff --git a/images/capi/ansible/roles/kubernetes/tasks/crictl-url.yml b/images/capi/ansible/roles/kubernetes/tasks/crictl-url.yml
 index 615a441e6..33101f6f1 100644
@@ -165,7 +165,7 @@ index ba75172c4..0c51278d7 100644
    "systemd_prefix": "/usr/lib/systemd",
    "sysusr_prefix": "/usr",
 diff --git a/images/capi/packer/goss/goss-command.yaml b/images/capi/packer/goss/goss-command.yaml
-index 7ea9925e8..d084fe1ac 100644
+index aa2179c6d..36cebb4b3 100644
 --- a/images/capi/packer/goss/goss-command.yaml
 +++ b/images/capi/packer/goss/goss-command.yaml
 @@ -37,6 +37,11 @@ command:

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

@@ -1,4 +1,4 @@
-From cc2b924f212c875714edf201588637e6f4e53798 Mon Sep 17 00:00:00 2001
+From 5ff2f2752aacbbd057d9a90dd2f52c8f624c81c8 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/13] Snow AMI support

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

@@ -1,4 +1,4 @@
-From 7f61c8f53b014241c5ff4337ddedff6c3868a601 Mon Sep 17 00:00:00 2001
+From a65fb710371d77a138a5824d8d157a90d65ff5fb Mon Sep 17 00:00:00 2001
 From: Jackson West <[email protected]>
 Date: Fri, 23 Jun 2023 10:50:08 -0500
 Subject: [PATCH 04/13] Ubuntu 22.04 support and improvements

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

@@ -1,4 +1,4 @@
-From a21b747bec93b12163136887703cd1d9b0adaaf7 Mon Sep 17 00:00:00 2001
+From a954f9d4ecdd410e0cd5d7c4e1fef95deae7af78 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/13] RHEL support and improvements
@@ -75,7 +75,7 @@ index 000000000..b2133b6f1
 +  loop: "{{ old_kernels }}"
 \ No newline at end of file
 diff --git a/images/capi/ansible/roles/setup/tasks/redhat.yml b/images/capi/ansible/roles/setup/tasks/redhat.yml
-index 5716fff78..c1fc46769 100644
+index 23a0789eb..9c692ce23 100644
 --- a/images/capi/ansible/roles/setup/tasks/redhat.yml
 +++ b/images/capi/ansible/roles/setup/tasks/redhat.yml
 @@ -22,6 +22,74 @@
@@ -153,7 +153,7 @@ index 5716fff78..c1fc46769 100644
 
  - name: Perform dnf clean
    ansible.builtin.command: /usr/bin/yum -y clean all
-@@ -58,3 +126,18 @@
+@@ -70,3 +138,18 @@
      name: "{{ extra_rpms.split() }}"
      state: present
      lock_timeout: 60

projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-improvements.patch

@@ -1,4 +1,4 @@
-From 2afd159589243181289bbb8ca0b524450a385e4a Mon Sep 17 00:00:00 2001
+From 4b5b836badbcd72df7964f0dcd24d4347d2cedcc Mon Sep 17 00:00:00 2001
 From: Ilya Alekseyev <[email protected]>
 Date: Wed, 11 Oct 2023 22:07:22 -0400
 Subject: [PATCH 06/13] Nutanix improvements
@@ -8,20 +8,11 @@ Subject: [PATCH 06/13] Nutanix improvements
 - Always download Nutanix source images and delete them after build
 Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
 ---
- images/capi/packer/nutanix/.gitignore       | 2 +-
  images/capi/packer/nutanix/packer.json.tmpl | 5 +++--
  images/capi/packer/nutanix/rhel-8.json      | 1 -
  images/capi/packer/nutanix/rhel-9.json      | 1 -
- 4 files changed, 4 insertions(+), 5 deletions(-)
+ 3 files changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/images/capi/packer/nutanix/.gitignore b/images/capi/packer/nutanix/.gitignore
-index f5f595899..b39358b5e 100644
---- a/images/capi/packer/nutanix/.gitignore
-+++ b/images/capi/packer/nutanix/.gitignore
-@@ -1,2 +1,2 @@
- packer.json
--user-data.tmpl
-+user-data
 diff --git a/images/capi/packer/nutanix/packer.json.tmpl b/images/capi/packer/nutanix/packer.json.tmpl
 index f53c51514..3d4e875b0 100644
 --- a/images/capi/packer/nutanix/packer.json.tmpl

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

@@ -1,4 +1,4 @@
-From ed4ddcbe24b243fba1240c45666d5d509d5cd900 Mon Sep 17 00:00:00 2001
+From b07eccb3d51839b87028c3818bcd4509282d9f48 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Mon, 21 Aug 2023 18:40:07 -0500
 Subject: [PATCH 07/13] adds retries and timeout to packer image-builder

projects/kubernetes-sigs/image-builder/patches/0008-Networking-improvements.patch

@@ -1,4 +1,4 @@
-From ef513c911f062f11c0a4a899fccaaba9aa36ad57 Mon Sep 17 00:00:00 2001
+From c4e5e285ee45da34436f12108bf8ce4e84d9bfbd Mon Sep 17 00:00:00 2001
 From: Taylor Neyland <[email protected]>
 Date: Wed, 19 Jul 2023 12:51:30 -0500
 Subject: [PATCH 08/13] Networking improvements

projects/kubernetes-sigs/image-builder/patches/0009-Support-and-improvements-for-RHEL-9-EFI.patch

@@ -1,4 +1,4 @@
-From 71c142521d1831bc054be32ae0d36e2f8e43c35b Mon Sep 17 00:00:00 2001
+From bf98b8437252d1bd66b442d57a80c5ac9ff3300c Mon Sep 17 00:00:00 2001
 From: Shizhao Liu <[email protected]>
 Date: Mon, 19 Aug 2024 10:14:26 -0700
 Subject: [PATCH 09/13] Support and improvements for RHEL 9 EFI

projects/kubernetes-sigs/image-builder/patches/0010-Pin-Packer-Goss-plugin-version-to-3.1.4.patch

@@ -1,4 +1,4 @@
-From ec02c52ae5b968f6187e4cd9fa7697b9aede1c4d Mon Sep 17 00:00:00 2001
+From 43cbd677af4c8de7d134a18f0d54fef4b2721aac Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <[email protected]>
 Date: Thu, 19 Sep 2024 15:36:00 -0700
 Subject: [PATCH 10/13] Pin Packer Goss plugin version to 3.1.4

projects/kubernetes-sigs/image-builder/patches/0011-Remove-containerd-configuration-for-hosts.toml-paths.patch

@@ -1,4 +1,4 @@
-From d2b744ec479a33432d319f6b525c3c6f1298be36 Mon Sep 17 00:00:00 2001
+From 2a227d8d883fa45d8a5707f103c2aa3dbacc9ce7 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <[email protected]>
 Date: Thu, 19 Sep 2024 16:04:19 -0700
 Subject: [PATCH 11/13] Remove containerd configuration for hosts.toml paths

projects/kubernetes-sigs/image-builder/patches/0012-Revert-updating-preseed-and-cloud-init-to-use-CD-for.patch

@@ -1,4 +1,4 @@
-From 84476d2ad3c940ff82c047a6c66a037ccc6b03ce Mon Sep 17 00:00:00 2001
+From d88ea412745abc2e10107b9fb961de2e4a11c455 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <[email protected]>
 Date: Thu, 19 Sep 2024 18:52:00 -0700
 Subject: [PATCH 12/13] Revert updating preseed and cloud-init to use CD for

projects/kubernetes-sigs/image-builder/patches/0013-Revert-Optionally-source-etc-default-kubelet-in-kube.patch

@@ -1,4 +1,4 @@
-From 18b1771fe5565472aa31a2abd7a39745517f769a Mon Sep 17 00:00:00 2001
+From 0fa714a6030e78b6db831c5b0f2dd9cbce7e569f Mon Sep 17 00:00:00 2001
 From: Saurabh Parekh <[email protected]>
 Date: Thu, 3 Oct 2024 21:24:40 -0700
 Subject: [PATCH 13/13] Revert "Optionally source /etc/default/kubelet in