[release-0.19] Bump kubernetes-sigs/image-builder and Bottlerocket ve…

…rsions to latest release (#3420)

* Bump kubernetes-sigs/image-builder and Bottlerocket versions to latest release

* Update EKS-D support and changes patch to apply cleanly on latest tag

* Update README to include 1-29 build status and remove 1-24

---------

Co-authored-by: Saurabh Parekh <[email protected]>

UPSTREAM_PROJECTS.yaml

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

projects/kubernetes-sigs/image-builder/BOTTLEROCKET_ADMIN_CONTAINER_METADATA

@@ -1,2 +1,2 @@
-imageDigest: sha256:2f884ebc34c0f54b6d75493ba2ad645f42525d6c90fe2099ae50708de6f86152
-tag: v0.11.6
+imageDigest: sha256:758e7c8306ec5ef049a23bb265f154d12b06cf351014ece86a3f94fbe083c666
+tag: v0.11.7

projects/kubernetes-sigs/image-builder/BOTTLEROCKET_CONTROL_CONTAINER_METADATA

@@ -1,2 +1,2 @@
-imageDigest: sha256:0ed73c9a2e35fab4287f3cbf18de084b740cace3234628c5e215adc407e52750
-tag: v0.7.10
+imageDigest: sha256:ac3ca4b5c705e84dc03d5061207201bff467fb90927b6ccb9299e6887c58862a
+tag: v0.7.11

projects/kubernetes-sigs/image-builder/BOTTLEROCKET_RELEASES

@@ -1,19 +1,19 @@
 1-25:
-  ami-release-version: v1.19.4
+  ami-release-version: v1.20.3
   ova-release-version: v1.19.4
   raw-release-version: v1.19.4
 1-26:
-  ami-release-version: v1.19.4
-  ova-release-version: v1.19.4
-  raw-release-version: v1.19.4
+  ami-release-version: v1.20.3
+  ova-release-version: v1.20.3
+  raw-release-version: v1.20.3
 1-27:
-  ami-release-version: v1.19.4
-  ova-release-version: v1.19.4
-  raw-release-version: v1.19.4
+  ami-release-version: v1.20.3
+  ova-release-version: v1.20.3
+  raw-release-version: v1.20.3
 1-28:
-  ami-release-version: v1.19.4
-  ova-release-version: v1.19.4
-  raw-release-version: v1.19.4
+  ami-release-version: v1.20.3
+  ova-release-version: v1.20.3
+  raw-release-version: v1.20.3
 1-29:
-  ami-release-version: v1.19.4
-  ova-release-version: v1.19.4
+  ami-release-version: v1.20.3
+  ova-release-version: v1.20.3

projects/kubernetes-sigs/image-builder/GIT_TAG

@@ -1 +1 @@
-v0.1.26
+v0.1.30

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

@@ -1,4 +1,4 @@
-From f4f01d01dde536c98331e1e4aad63b50386f4288 Mon Sep 17 00:00:00 2001
+From 96dd990d39a10e2e5ba1aba4a3bba7aadc818414 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Tue, 11 Jan 2022 21:05:13 -0800
 Subject: [PATCH 1/8] 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 1b7b2d13d..7b5ef1369 100644
+index 46e1b3a3a..c9ede60bd 100644
 --- a/images/capi/packer/ova/packer-node.json
 +++ b/images/capi/packer/ova/packer-node.json
-@@ -474,7 +474,7 @@
+@@ -478,7 +478,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": "",
@@ -74,5 +74,5 @@ index 1b7b2d13d..7b5ef1369 100644
      "existing_ansible_ssh_args": "{{env `ANSIBLE_SSH_ARGS`}}",
      "export_manifest": "none",
 -- 
-2.39.3 (Apple Git-146)
+2.45.2
 

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

@@ -1,26 +1,21 @@
-From b3ac609aa5b28b1657c75132793421acdab831aa Mon Sep 17 00:00:00 2001
+From 7bbf912b6f798557439a70bcbdcabb5ca4623134 Mon Sep 17 00:00:00 2001
 From: Abhay Krishna Arunachalam <[email protected]>
 Date: Thu, 2 Feb 2023 01:39:15 -0800
 Subject: [PATCH 3/8] 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(-)
+ images/capi/packer/ami/packer.json | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json
-index eb4552a4c..f5856f4c3 100644
+index 0bfbf32cd..33fcfd43a 100644
 --- a/images/capi/packer/ami/packer.json
 +++ b/images/capi/packer/ami/packer.json
 @@ -4,7 +4,7 @@
        "access_key": "{{user `aws_access_key`}}",
        "ami_description": "{{user `ami_description`}}",
        "ami_groups": "{{user `ami_groups`}}",
--      "ami_name": "capa-ami-{{user `build_name`}}-{{user `kubernetes_semver` | clean_resource_name}}-{{user `build_timestamp`}}",
+-      "ami_name": "{{ user `image_name` | clean_resource_name}}",
 +      "ami_name": "capas-ami-{{user `build_name`}}-{{user `kubernetes_semver` | clean_resource_name}}-{{user `build_timestamp`}}",
        "ami_product_codes": "",
        "ami_regions": "{{user `ami_regions`}}",
@@ -46,7 +41,14 @@ index eb4552a4c..f5856f4c3 100644
 +    "http_put_response_hop_limit": "2",
      "iam_instance_profile": "",
      "ib_version": "{{env `IB_VERSION`}}",
-     "iops": "3000",
+     "image_name": "capa-ami-{{user `build_name`}}-{{user `kubernetes_semver` }}-{{user `build_timestamp`}}",
+@@ -212,4 +220,4 @@
+     "volume_type": "gp3",
+     "vpc_id": ""
+   }
+-}
++}
+\ No newline at end of file
 -- 
-2.39.3 (Apple Git-146)
+2.45.2
 

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

@@ -1,4 +1,4 @@
-From 9fb1df53369b29ea244e04b706c157aff0f0701a Mon Sep 17 00:00:00 2001
+From f1f58b4a3f1a4accdbbc061d271b58370fbb787f Mon Sep 17 00:00:00 2001
 From: Jackson West <[email protected]>
 Date: Fri, 23 Jun 2023 10:50:08 -0500
 Subject: [PATCH 4/8] Ubuntu 22.04 support and improvements
@@ -28,10 +28,10 @@ Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
  create mode 100644 images/capi/packer/raw/raw-ubuntu-2204.json
 
 diff --git a/images/capi/Makefile b/images/capi/Makefile
-index 773c89e4a..4a87e4b36 100644
+index 143c83999..152d33da6 100644
 --- a/images/capi/Makefile
 +++ b/images/capi/Makefile
-@@ -365,7 +365,7 @@ QEMU_BUILD_NAMES			?=	qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2304 qemu-ub
+@@ -366,7 +366,7 @@ QEMU_BUILD_NAMES			?=	qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2304 qemu-ub
 
  QEMU_KUBEVIRT_BUILD_NAMES	:= $(addprefix kubevirt-,$(QEMU_BUILD_NAMES))
 
@@ -40,7 +40,7 @@ index 773c89e4a..4a87e4b36 100644
 
  POWERVS_BUILD_NAMES         ?= powervs-centos-8
 
-@@ -778,6 +778,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images
+@@ -785,6 +785,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
@@ -49,7 +49,7 @@ index 773c89e4a..4a87e4b36 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
-@@ -937,6 +939,8 @@ validate-qemu-all: $(QEMU_VALIDATE_TARGETS) ## Validates all Qemu Packer config
+@@ -948,6 +950,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
@@ -361,5 +361,5 @@ index 000000000..9317900f5
 +  "shutdown_command": "shutdown -P now"
 +  }
 -- 
-2.39.3 (Apple Git-146)
+2.45.2
 

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

@@ -1,4 +1,4 @@
-From 557098ae0be5d023da618bccb4a05e81ade33073 Mon Sep 17 00:00:00 2001
+From 7dd33c1ba11d0e198f17e45baa1933865b940fd1 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Tue, 6 Dec 2022 15:42:02 -0600
 Subject: [PATCH 5/8] RHEL support and improvements
@@ -230,5 +230,5 @@ index 435797c65..e97099f63 100644
    "ansible_scp_extra_args": "{{env `ANSIBLE_SCP_EXTRA_ARGS`}}"
  }
 -- 
-2.39.3 (Apple Git-146)
+2.45.2
 

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

@@ -1,4 +1,4 @@
-From 7c12ef7de7fc0a730fb99ce9c68b3f06cbcf1e69 Mon Sep 17 00:00:00 2001
+From 0bbac99ce398812f96dffbe2cb0991587b617e3d Mon Sep 17 00:00:00 2001
 From: Ilya Alekseyev <[email protected]>
 Date: Wed, 11 Oct 2023 22:07:22 -0400
 Subject: [PATCH 6/8] Nutanix improvements
@@ -58,5 +58,5 @@ index b7dddb4f2..921a9729f 100644
    "shutdown_command": "shutdown -P now",
    "user_data": "I2Nsb3VkLWNvbmZpZwp1c2VyczoKICAtIG5hbWU6IGJ1aWxkZXIKICAgIHN1ZG86IFsnQUxMPShBTEwpIE5PUEFTU1dEOkFMTCddCmNocGFzc3dkOgogIGxpc3Q6IHwKICAgIGJ1aWxkZXI6YnVpbGRlcgogIGV4cGlyZTogRmFsc2UKc3NoX3B3YXV0aDogVHJ1ZQ=="
 -- 
-2.39.3 (Apple Git-146)
+2.45.2
 

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

@@ -1,4 +1,4 @@
-From 88992bddd0c44220d55534e33d06caf7664fadfb Mon Sep 17 00:00:00 2001
+From 746d2c799760508d11c991bceab1b3f593830889 Mon Sep 17 00:00:00 2001
 From: Prow Bot <[email protected]>
 Date: Mon, 21 Aug 2023 18:40:07 -0500
 Subject: [PATCH 7/8] adds retries and timeout to packer image-builder
@@ -13,7 +13,7 @@ Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
  5 files changed, 32 insertions(+), 9 deletions(-)
 
 diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json
-index f5856f4c3..94bb7c732 100644
+index 33fcfd43a..a302529c7 100644
 --- a/images/capi/packer/ami/packer.json
 +++ b/images/capi/packer/ami/packer.json
 @@ -107,7 +107,9 @@
@@ -44,10 +44,10 @@ index bab9c2bde..7b3298826 100644
    "vmx_version": "15",
    "vnc_bind_address": "127.0.0.1",
 diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json
-index 5132b5e21..9b421e968 100644
+index ab50f6e22..debb04643 100644
 --- a/images/capi/packer/ova/packer-node.json
 +++ b/images/capi/packer/ova/packer-node.json
-@@ -18,8 +18,9 @@
+@@ -19,8 +19,9 @@
        "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
        "skip_compaction": "{{user `skip_compaction`}}",
        "source_path": "{{ user `source_path`}}",
@@ -58,7 +58,7 @@ index 5132b5e21..9b421e968 100644
        "ssh_username": "{{user `ssh_username`}}",
        "type": "vmware-vmx",
        "vm_name": "{{user `build_version`}}",
-@@ -67,8 +68,9 @@
+@@ -68,8 +69,9 @@
        "remote_username": "{{user `remote_username`}}",
        "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c '{{user `shutdown_command`}}'",
        "skip_compaction": "{{user `skip_compaction`}}",
@@ -69,7 +69,7 @@ index 5132b5e21..9b421e968 100644
        "ssh_username": "{{user `ssh_username`}}",
        "type": "vmware-iso",
        "version": "{{user `vmx_version`}}",
-@@ -115,8 +117,9 @@
+@@ -116,8 +118,9 @@
        "remote_username": "{{user `remote_username`}}",
        "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
        "skip_compaction": "{{user `skip_compaction`}}",
@@ -80,7 +80,7 @@ index 5132b5e21..9b421e968 100644
        "ssh_username": "{{user `ssh_username`}}",
        "type": "vmware-iso",
        "version": "{{user `vmx_version`}}",
-@@ -174,8 +177,9 @@
+@@ -175,8 +178,9 @@
        "resource_pool": "{{user `resource_pool`}}",
        "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c '{{user `shutdown_command`}}'",
        "ssh_clear_authorized_keys": "false",
@@ -91,7 +91,7 @@ index 5132b5e21..9b421e968 100644
        "ssh_username": "{{user `ssh_username`}}",
        "storage": [
          {
-@@ -239,7 +243,8 @@
+@@ -240,7 +244,8 @@
        "ssh_password": "{{user `ssh_password`}}",
        "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
        "ssh_proxy_port": "{{user `ssh_proxy_port`}}",
@@ -101,7 +101,7 @@ index 5132b5e21..9b421e968 100644
        "ssh_username": "{{user `ssh_username`}}",
        "storage": [
          {
-@@ -280,7 +285,8 @@
+@@ -281,7 +286,8 @@
        "resource_pool": "{{user `resource_pool`}}",
        "shutdown_command": "echo '{{user `ssh_password`}}' | sudo -S -E sh -c 'userdel -f -r {{user `ssh_username`}} && rm -f /etc/sudoers.d/{{user `ssh_username` }} && {{user `shutdown_command`}}'",
        "ssh_password": "{{user `ssh_password`}}",
@@ -111,7 +111,7 @@ index 5132b5e21..9b421e968 100644
        "ssh_username": "{{user `ssh_username`}}",
        "template": "{{user `template`}}",
        "type": "vsphere-clone",
-@@ -380,7 +386,9 @@
+@@ -381,7 +387,9 @@
          "--scp-extra-args",
          "{{user `ansible_scp_extra_args`}}"
        ],
@@ -121,7 +121,7 @@ index 5132b5e21..9b421e968 100644
        "type": "ansible",
        "user": "{{user `ssh_username`}}"
      },
-@@ -413,7 +421,9 @@
+@@ -414,7 +422,9 @@
          "--scp-extra-args",
          "{{user `ansible_scp_extra_args`}}"
        ],
@@ -202,5 +202,5 @@ index 3b61117df..29d18badd 100644
        "user": "builder"
      },
 -- 
-2.39.3 (Apple Git-146)
+2.45.2
 

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

@@ -1,4 +1,4 @@
-From 6a5c8d8405bc3acae4d2526adeda6bf24119815f Mon Sep 17 00:00:00 2001
+From 0c2d5a9045384c28233b1e6cb8a66c583918eace Mon Sep 17 00:00:00 2001
 From: Taylor Neyland <[email protected]>
 Date: Wed, 19 Jul 2023 12:51:30 -0500
 Subject: [PATCH 8/8] Networking improvements
@@ -18,10 +18,10 @@ Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
  create mode 100644 images/capi/ansible/roles/providers/files/etc/systemd/system/disable-udp-offload-ubuntu.service
 
 diff --git a/images/capi/Makefile b/images/capi/Makefile
-index 4a87e4b36..aa557717b 100644
+index 152d33da6..1d5e61db5 100644
 --- a/images/capi/Makefile
 +++ b/images/capi/Makefile
-@@ -318,7 +318,7 @@ WINDOWS_VERSIONS		:=	windows-2019 windows-2019-efi windows-2022 windows-2022-efi
+@@ -319,7 +319,7 @@ WINDOWS_VERSIONS		:=	windows-2019 windows-2019-efi windows-2022 windows-2022-efi
 
  # Set Flatcar Container Linux channel and version if not supplied
  FLATCAR_CHANNEL ?= stable
@@ -125,5 +125,5 @@ index 2f65fb1fb..4d6f06333 100644
 +    state: stopped
 +  when: ansible_distribution_version is version('22.04', '>=')
 -- 
-2.39.3 (Apple Git-146)
+2.45.2