diff --git a/projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch index 3f2307c319..5185d143d2 100644 --- 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 769673a5f47de94093308675d846f4462577317a Mon Sep 17 00:00:00 2001 +From 1a7b49b1a63a3ecde670210fec712fb3d202ff5a Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 21:05:13 -0800 Subject: [PATCH 01/10] OVA improvements @@ -15,11 +15,11 @@ Signed-off-by: Vignesh Goutham Ganesh 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/images/capi/ansible/roles/sysprep/tasks/main.yml b/images/capi/ansible/roles/sysprep/tasks/main.yml -index a9fa954d5..a526528ea 100644 +index c1293deb9..d4249d974 100644 --- a/images/capi/ansible/roles/sysprep/tasks/main.yml +++ b/images/capi/ansible/roles/sysprep/tasks/main.yml @@ -27,6 +27,15 @@ - - import_tasks: photon.yml + - ansible.builtin.import_tasks: photon.yml when: ansible_os_family == "VMware Photon OS" +- name: Get stats of the /etc/pki folder @@ -32,7 +32,7 @@ index a9fa954d5..a526528ea 100644 + when: pki.stat.isdir is defined and pki.stat.isdir + - name: Remove containerd http proxy conf file if needed - file: + ansible.builtin.file: path: /etc/systemd/system/containerd.service.d/http-proxy.conf diff --git a/images/capi/hack/ovf_template.xml b/images/capi/hack/ovf_template.xml index 316427ec3..ca23db5f9 100644 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 index e0dea4d0d4..66038bc3f1 100644 --- 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 48ff6678b232a40aaff06c8551dcac607351b481 Mon Sep 17 00:00:00 2001 +From 2cf068d183c965d9d04ed3995bffcf7092a4e5f8 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 18:36:56 -0800 Subject: [PATCH 02/10] EKS-D support and changes @@ -27,7 +27,7 @@ Signed-off-by: Vignesh Goutham Ganesh 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 4330798da..1ca1d756e 100644 +index 615a441e6..33101f6f1 100644 --- a/images/capi/ansible/roles/kubernetes/tasks/crictl-url.yml +++ b/images/capi/ansible/roles/kubernetes/tasks/crictl-url.yml @@ -12,23 +12,10 @@ @@ -35,20 +35,20 @@ index 4330798da..1ca1d756e 100644 # limitations under the License. --- -- name: Download crictl checksum -- get_url: +- ansible.builtin.get_url: - url: "{{ crictl_sha256 }}" - dest: /tmp/crictl.tar.gz.sha256 - mode: "0600" - -- name: Register checksum value for crictl -- slurp: +- ansible.builtin.slurp: - src: /tmp/crictl.tar.gz.sha256 - register: csum - - name: Download crictl - vars: - sha256: "{{ csum['content'] | b64decode | trim }}" - get_url: + ansible.builtin.get_url: url: "{{ crictl_url }}" - checksum: sha256:{{ sha256 }} + checksum: "sha256:{{ crictl_sha256 }}" @@ -56,7 +56,7 @@ index 4330798da..1ca1d756e 100644 mode: "0600" diff --git a/images/capi/ansible/roles/kubernetes/tasks/url.yml b/images/capi/ansible/roles/kubernetes/tasks/url.yml -index 22c64b892..c09139060 100644 +index d18e79b4f..b191df4b9 100644 --- a/images/capi/ansible/roles/kubernetes/tasks/url.yml +++ b/images/capi/ansible/roles/kubernetes/tasks/url.yml @@ -12,6 +12,41 @@ @@ -99,12 +99,12 @@ index 22c64b892..c09139060 100644 + group: root + - name: Create CNI directory - file: + ansible.builtin.file: state: directory @@ -22,7 +57,7 @@ - name: Download CNI tarball - get_url: + ansible.builtin.get_url: - url: "{{ kubernetes_cni_http_source }}/{{ kubernetes_cni_semver }}/cni-plugins-linux-{{ kubernetes_goarch }}-{{ kubernetes_cni_semver }}.tgz" + url: "{{ kubernetes_cni_http_source }}/{{ kubernetes_cni_semver }}/cni-plugins-linux-{{ kubernetes_goarch }}-{{ kubernetes_cni_semver }}.tar.gz" checksum: "{{ kubernetes_cni_http_checksum }}" @@ -229,10 +229,10 @@ index 278f403fa..eb92570cc 100644 {{ $name }}: exists: {{ $vers.exists }} diff --git a/images/capi/packer/goss/goss-vars.yaml b/images/capi/packer/goss/goss-vars.yaml -index a7878bfa2..8dd593110 100644 +index da180514a..aeeeb0ea2 100644 --- a/images/capi/packer/goss/goss-vars.yaml +++ b/images/capi/packer/goss/goss-vars.yaml -@@ -105,6 +105,12 @@ kubernetes_cni_rpm_version: "" +@@ -110,6 +110,12 @@ kubernetes_cni_rpm_version: "" # When k8s and k8s cni source is http kubernetes_load_additional_imgs: false @@ -264,7 +264,7 @@ 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 1b7b2d13d..a55c78038 100644 +index 7b5ef1369..5132b5e21 100644 --- a/images/capi/packer/ova/packer-node.json +++ b/images/capi/packer/ova/packer-node.json @@ -451,7 +451,12 @@ 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 index b0b43abf5f..3dd6872486 100644 --- 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 c878d0011c9ffb7720ba7f462689b54a2056961a Mon Sep 17 00:00:00 2001 +From 5ed35ade7c6f872e5daaa92db0071abf33c50bde Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Thu, 2 Feb 2023 01:39:15 -0800 Subject: [PATCH 03/10] Snow AMI support diff --git a/projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch b/projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch index 3b1374b0b5..2e422b4864 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch @@ -1,4 +1,4 @@ -From 91e25d9f32abe319fdef1aeea07c40f2750cbacd Mon Sep 17 00:00:00 2001 +From 6a8f400fdfb60c7911d8abb926efdd423bda4f78 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Fri, 23 Jun 2023 10:50:08 -0500 Subject: [PATCH 04/10] Ubuntu 22 support and improvements @@ -9,8 +9,6 @@ Subject: [PATCH 04/10] Ubuntu 22 support and improvements - sets OS_VERSION for goss validation on raw image builds --- images/capi/Makefile | 6 +- - images/capi/packer/ova/ubuntu-2204-efi.json | 4 +- - images/capi/packer/ova/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 @@ -20,7 +18,7 @@ Subject: [PATCH 04/10] Ubuntu 22 support and improvements 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 ++ - 12 files changed, 248 insertions(+), 5 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 @@ -29,7 +27,7 @@ Subject: [PATCH 04/10] 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 7f94fea88..09945c609 100644 +index d602b2860..d555c304f 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 @@ -41,7 +39,7 @@ index 7f94fea88..09945c609 100644 VBOX_BUILD_NAMES ?= vbox-windows-2019 POWERVS_BUILD_NAMES ?= powervs-centos-8 -@@ -775,6 +775,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images +@@ -783,6 +783,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 @@ -50,7 +48,7 @@ index 7f94fea88..09945c609 100644 build-raw-rhel-8: ## Builds RHEL 8 RAW image build-raw-all: $(RAW_BUILD_TARGETS) ## Builds all RAW images -@@ -913,6 +915,8 @@ validate-qemu-all: $(QEMU_VALIDATE_TARGETS) ## Validates all Qemu Packer config +@@ -924,6 +926,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 @@ -59,38 +57,6 @@ index 7f94fea88..09945c609 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 0bc473353..5d199b8b0 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": "10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb", -+ "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", - "iso_checksum_type": "sha256", -- "iso_url": "https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso", -+ "iso_url": "https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.2-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 badbf1045..38efb01c8 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": "10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb", -+ "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", - "iso_checksum_type": "sha256", -- "iso_url": "https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso", -+ "iso_url": "https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.2-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/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 @@ -331,7 +297,7 @@ index a04be4e8f..83aa6b4fb 100644 "containerd_version": "{{user `containerd_version`}}", "kubernetes_cni_deb_version": "{{ user `kubernetes_cni_deb_version` }}", diff --git a/images/capi/packer/raw/raw-ubuntu-2004-efi.json b/images/capi/packer/raw/raw-ubuntu-2004-efi.json -index 7ed3ac8a3..421fe6976 100644 +index e8ad83891..efd64aacb 100644 --- a/images/capi/packer/raw/raw-ubuntu-2004-efi.json +++ b/images/capi/packer/raw/raw-ubuntu-2004-efi.json @@ -4,6 +4,7 @@ @@ -341,9 +307,9 @@ index 7ed3ac8a3..421fe6976 100644 + "distro_version": "20.04", "firmware": "OVMF.fd", "guest_os_type": "ubuntu-64", - "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2", + "iso_checksum": "5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4", diff --git a/images/capi/packer/raw/raw-ubuntu-2004.json b/images/capi/packer/raw/raw-ubuntu-2004.json -index 9e78e6384..cbcfbc6f3 100644 +index 9ab9bd993..cd0ca68f3 100644 --- a/images/capi/packer/raw/raw-ubuntu-2004.json +++ b/images/capi/packer/raw/raw-ubuntu-2004.json @@ -4,6 +4,7 @@ @@ -352,7 +318,7 @@ index 9e78e6384..cbcfbc6f3 100644 "distro_name": "ubuntu", + "distro_version": "20.04", "guest_os_type": "ubuntu-64", - "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2", + "iso_checksum": "5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4", "iso_checksum_type": "sha256", diff --git a/images/capi/packer/raw/raw-ubuntu-2204-efi.json b/images/capi/packer/raw/raw-ubuntu-2204-efi.json new file mode 100644 @@ -370,7 +336,7 @@ index 000000000..6839cc2d0 + "guest_os_type": "ubuntu-64", + "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", + "iso_checksum_type": "sha256", -+ "iso_url": "https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.2-live-server-amd64.iso", ++ "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", + "os_display_name": "Ubuntu 22.04", + "shutdown_command": "shutdown -P now" + } @@ -389,7 +355,7 @@ index 000000000..c9cfe7381 + "guest_os_type": "ubuntu-64", + "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", + "iso_checksum_type": "sha256", -+ "iso_url": "https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.2-live-server-amd64.iso", ++ "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", + "os_display_name": "Ubuntu 22.04", + "shutdown_command": "shutdown -P now" + } 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 index 9b4c64be7d..813e727a89 100644 --- 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 fc9896eda26f6d36b15bd294b3031c815aeb9f64 Mon Sep 17 00:00:00 2001 +From 6ff95bd70fb15b8207e6f22e1f4edc18be744830 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 6 Dec 2022 15:42:02 -0600 Subject: [PATCH 05/10] RHEL support and improvements @@ -25,11 +25,11 @@ Signed-off-by: Vignesh Goutham Ganesh create mode 100644 images/capi/ansible/roles/providers/files/etc/systemd/system/cloud-init.service.d/boot-order.conf diff --git a/images/capi/ansible/roles/node/tasks/main.yml b/images/capi/ansible/roles/node/tasks/main.yml -index e0513f565..f2094927f 100644 +index 484556b17..78da9fc30 100644 --- a/images/capi/ansible/roles/node/tasks/main.yml +++ b/images/capi/ansible/roles/node/tasks/main.yml @@ -18,6 +18,9 @@ - - import_tasks: amazonLinux2.yml + - ansible.builtin.import_tasks: amazonLinux2.yml when: ansible_distribution == "Amazon" +- import_tasks: redhat.yml @@ -37,7 +37,7 @@ index e0513f565..f2094927f 100644 + # This is required until https://github.com/ansible/ansible/issues/77537 is fixed and used. - name: Override Flatcar's OS family - set_fact: + ansible.builtin.set_fact: diff --git a/images/capi/ansible/roles/node/tasks/redhat.yml b/images/capi/ansible/roles/node/tasks/redhat.yml new file mode 100644 index 000000000..b2133b6f1 @@ -87,10 +87,10 @@ index 000000000..e1059e3eb +After=NetworkManager-wait-online.service \ No newline at end of file diff --git a/images/capi/ansible/roles/providers/tasks/main.yml b/images/capi/ansible/roles/providers/tasks/main.yml -index b55b78099..a58f0e7c0 100644 +index 88f572908..27f075c6e 100644 --- a/images/capi/ansible/roles/providers/tasks/main.yml +++ b/images/capi/ansible/roles/providers/tasks/main.yml -@@ -81,6 +81,21 @@ +@@ -80,6 +80,21 @@ mode: "0644" when: ansible_os_family != "Flatcar" @@ -113,7 +113,7 @@ index b55b78099..a58f0e7c0 100644 # Enable all cloud-init services on boot. - name: Make sure all cloud init services are enabled diff --git a/images/capi/ansible/roles/setup/tasks/redhat.yml b/images/capi/ansible/roles/setup/tasks/redhat.yml -index 74329afd4..e20e3da6c 100644 +index 5716fff78..5ab43bed9 100644 --- a/images/capi/ansible/roles/setup/tasks/redhat.yml +++ b/images/capi/ansible/roles/setup/tasks/redhat.yml @@ -22,6 +22,74 @@ @@ -190,9 +190,9 @@ index 74329afd4..e20e3da6c 100644 + - rhsm_server_proxy_hostname != "" - name: Perform dnf clean - command: /usr/bin/yum -y clean all + ansible.builtin.command: /usr/bin/yum -y clean all @@ -45,6 +113,7 @@ - yum: + ansible.builtin.yum: name: "*" state: latest + exclude: cloud-init* diff --git a/projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch b/projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch index 6c97527d80..6eb323af22 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch @@ -1,4 +1,4 @@ -From 88728dfcd01eb686f7323d02d6f2aa698607aa4e Mon Sep 17 00:00:00 2001 +From 244abfda7a3118d4e643478f8fe9d029f84a20b3 Mon Sep 17 00:00:00 2001 From: Ilya Alekseyev Date: Wed, 11 Oct 2023 22:07:22 -0400 Subject: [PATCH 06/10] Nutanix RHEL support for AWS image-builder diff --git a/projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch b/projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch index 29f8e0c310..65cf2f80aa 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch @@ -1,4 +1,4 @@ -From 1ce9df7370e4d113e1297c9cbaabf8d8ddb9ff8d Mon Sep 17 00:00:00 2001 +From c0ce9c42371cda4fdc4b96de8ad770ebd1fd4dca Mon Sep 17 00:00:00 2001 From: Prow Bot Date: Mon, 21 Aug 2023 18:40:07 -0500 Subject: [PATCH 07/10] adds retries and timeout to packer image-builder @@ -26,10 +26,10 @@ index f5856f4c3..94bb7c732 100644 }, { diff --git a/images/capi/packer/ova/packer-common.json b/images/capi/packer/ova/packer-common.json -index c6835bd43..dd2d80126 100644 +index bab9c2bde..7b3298826 100644 --- a/images/capi/packer/ova/packer-common.json +++ b/images/capi/packer/ova/packer-common.json -@@ -22,10 +22,11 @@ +@@ -23,10 +23,11 @@ "remote_type": "", "remote_username": "", "skip_compaction": "false", @@ -43,7 +43,7 @@ index c6835bd43..dd2d80126 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 a55c78038..8835649cc 100644 +index 5132b5e21..9b421e968 100644 --- a/images/capi/packer/ova/packer-node.json +++ b/images/capi/packer/ova/packer-node.json @@ -18,8 +18,9 @@ diff --git a/projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch b/projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch index 8cda5fc2a6..6e6a7deb05 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch @@ -1,4 +1,4 @@ -From 90c7d03a59d52e627346ef34c25a3bfcab0d524f Mon Sep 17 00:00:00 2001 +From 74a69b2170a0bab41c0105660efcd39940ec0271 Mon Sep 17 00:00:00 2001 From: Taylor Neyland Date: Wed, 19 Jul 2023 12:51:30 -0500 Subject: [PATCH 08/10] Disable UDP offload service for Redhat and Ubuntu @@ -58,11 +58,11 @@ index 000000000..7f5d50a8e +WantedBy=network-online.target \ No newline at end of file diff --git a/images/capi/ansible/roles/providers/tasks/vmware-redhat.yml b/images/capi/ansible/roles/providers/tasks/vmware-redhat.yml -index 17117110a..152ff0515 100644 +index 1f8a6713a..3632b994c 100644 --- a/images/capi/ansible/roles/providers/tasks/vmware-redhat.yml +++ b/images/capi/ansible/roles/providers/tasks/vmware-redhat.yml -@@ -49,3 +49,20 @@ - file: +@@ -57,3 +57,20 @@ + ansible.builtin.file: path: /tmp/cloud-init-vmware.sh state: absent + @@ -83,7 +83,7 @@ index 17117110a..152ff0515 100644 + state: stopped + when: ansible_os_family != "Flatcar" diff --git a/images/capi/ansible/roles/providers/tasks/vmware-ubuntu.yml b/images/capi/ansible/roles/providers/tasks/vmware-ubuntu.yml -index b3aeab637..ee1d20c0f 100644 +index 2f65fb1fb..4d6f06333 100644 --- a/images/capi/ansible/roles/providers/tasks/vmware-ubuntu.yml +++ b/images/capi/ansible/roles/providers/tasks/vmware-ubuntu.yml @@ -51,3 +51,20 @@ diff --git a/projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch b/projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch index a785890813..413a095b2c 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch @@ -1,4 +1,4 @@ -From 41af0e769f9e3dc83f444dd586794bd76f95b282 Mon Sep 17 00:00:00 2001 +From 1c4e096648525e109be44418f6447e1c18c2dc26 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Wed, 20 Sep 2023 10:33:44 -0500 Subject: [PATCH 09/10] Default Flatcar version to avoid pulling from internet @@ -10,10 +10,10 @@ Signed-off-by: Vignesh Goutham Ganesh 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/capi/Makefile b/images/capi/Makefile -index 09945c609..8c33b430f 100644 +index d555c304f..36fd00592 100644 --- a/images/capi/Makefile +++ b/images/capi/Makefile -@@ -325,7 +325,7 @@ WINDOWS_VERSIONS := windows-2019 windows-2022 +@@ -325,7 +325,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 diff --git a/projects/kubernetes-sigs/image-builder/patches/0010-Adds-support-for-cloudstack-rhel-9.patch b/projects/kubernetes-sigs/image-builder/patches/0010-Adds-support-for-cloudstack-rhel-9.patch index 40fd9ccc36..e320197c6c 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0010-Adds-support-for-cloudstack-rhel-9.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0010-Adds-support-for-cloudstack-rhel-9.patch @@ -1,29 +1,31 @@ -From 030dab702d89b7fc2eb9ebcc6ae9f6842e3e154b Mon Sep 17 00:00:00 2001 +From e9e68b3c26fd658cb0251678751ec9e52f084f8e Mon Sep 17 00:00:00 2001 From: ahreehong <46465244+ahreehong@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:01:07 -0800 Subject: [PATCH 10/10] Adds support for cloudstack rhel 9 Signed-off-by: ahreehong <46465244+ahreehong@users.noreply.github.com> --- - images/capi/Makefile | 6 ++++-- + images/capi/Makefile | 8 +++++--- .../capi/packer/qemu/linux/centos/http/9/ks.cfg | 2 +- images/capi/packer/qemu/qemu-rhel-9.json | 16 ++++++++++++++++ - 3 files changed, 21 insertions(+), 3 deletions(-) + 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 images/capi/packer/qemu/qemu-rhel-9.json diff --git a/images/capi/Makefile b/images/capi/Makefile -index 8c33b430f..d7f0afc3c 100644 +index 36fd00592..a1d91dad2 100644 --- a/images/capi/Makefile +++ b/images/capi/Makefile -@@ -318,7 +318,7 @@ PACKER_POWERVS_NODE_FLAGS := $(foreach f,$(abspath $(COMMON_POWERVS_VAR_FILES)), +@@ -318,8 +318,8 @@ PACKER_POWERVS_NODE_FLAGS := $(foreach f,$(abspath $(COMMON_POWERVS_VAR_FILES)), CENTOS_VERSIONS := centos-7 FLATCAR_VERSIONS := flatcar PHOTON_VERSIONS := photon-3 photon-4 photon-5 -RHEL_VERSIONS := rhel-7 rhel-8 +-ROCKYLINUX_VERSIONS := rockylinux-8 rockylinux-9 +RHEL_VERSIONS := rhel-7 rhel-8 rhel-9 - ROCKYLINUX_VERSIONS := rockylinux-8 ++ROCKYLINUX_VERSIONS := rockylinux-8 rockylinux-9 UBUNTU_VERSIONS := ubuntu-2004 ubuntu-2004-efi ubuntu-2204 ubuntu-2204-efi - WINDOWS_VERSIONS := windows-2019 windows-2022 + WINDOWS_VERSIONS := windows-2019 windows-2019-efi windows-2022 windows-2022-efi + @@ -368,7 +368,7 @@ OPENSTACK_BUILD_NAMES ?= openstack-ubuntu-2004 openstack-ubuntu-2204 openstack-f OSC_BUILD_NAMES ?= osc-ubuntu-2004 osc-ubuntu-2204 @@ -33,7 +35,7 @@ index 8c33b430f..d7f0afc3c 100644 QEMU_KUBEVIRT_BUILD_NAMES := $(addprefix kubevirt-,$(QEMU_BUILD_NAMES)) -@@ -768,6 +768,7 @@ build-qemu-ubuntu-2304: ## Builds Ubuntu 23.04 QEMU image +@@ -776,6 +776,7 @@ build-qemu-ubuntu-2304: ## Builds Ubuntu 23.04 QEMU image build-qemu-centos-7: ## Builds CentOS 7 QEMU image build-qemu-centos-9: ## Builds CentOS 9 Stream QEMU image build-qemu-rhel-8: ## Builds RHEL 8 QEMU image @@ -41,7 +43,7 @@ index 8c33b430f..d7f0afc3c 100644 build-qemu-rockylinux-8: ## Builds Rocky 8 QEMU image build-qemu-rockylinux-9: ## Builds Rocky 9 QEMU image build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images -@@ -908,6 +909,7 @@ validate-qemu-ubuntu-2204-efi: ## Validates Ubuntu 22.04 QEMU EFI image packer c +@@ -919,6 +920,7 @@ validate-qemu-ubuntu-2204-efi: ## Validates Ubuntu 22.04 QEMU EFI image packer c validate-qemu-ubuntu-2304: ## Validates Ubuntu 23.04 QEMU image packer config validate-qemu-centos-7: ## Validates CentOS 7 QEMU image packer config validate-qemu-rhel-8: ## Validates RHEL 8 QEMU image