-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch to update Ubuntu 22.04 ISO URLs to latest stable release
- Loading branch information
1 parent
5cb6869
commit 847314f
Showing
11 changed files
with
114 additions
and
17 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
projects/kubernetes-sigs/image-builder/patches/0002-EKS-D-support-and-changes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
projects/kubernetes-sigs/image-builder/patches/0003-Snow-AMI-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...bernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...es-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...s-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...igs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...s/kubernetes-sigs/image-builder/patches/0010-Revert-updates-to-Ubuntu-2004-ISO-URLs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...tes-sigs/image-builder/patches/0011-Update-Ubuntu-22.04-ISO-URLs-to-use-stable-URLs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
From ddaa7cf851a2b92fb54bb2238a7c131e3de5336f Mon Sep 17 00:00:00 2001 | ||
From: Marcus Noble <github@marcusnoble.co.uk> | ||
Date: Fri, 5 Apr 2024 09:47:34 +0100 | ||
Subject: [PATCH 11/11] Update Ubuntu 22.04 ISO URLs to use stable URLs | ||
|
||
Signed-off-by: Marcus Noble <github@marcusnoble.co.uk> | ||
--- | ||
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 ++-- | ||
images/capi/packer/qemu/qemu-ubuntu-2204-efi.json | 4 ++-- | ||
images/capi/packer/qemu/qemu-ubuntu-2204.json | 4 ++-- | ||
5 files changed, 10 insertions(+), 10 deletions(-) | ||
|
||
diff --git a/images/capi/packer/ova/ubuntu-2204-efi.json b/images/capi/packer/ova/ubuntu-2204-efi.json | ||
index a2f2fb86f..ffd4bf6c8 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": "a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd", | ||
+ "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2", | ||
"iso_checksum_type": "sha256", | ||
- "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", | ||
+ "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-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 b4acf4d9e..e436d93b9 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": "a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd", | ||
+ "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2", | ||
"iso_checksum_type": "sha256", | ||
- "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", | ||
+ "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-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 3006f001b..78aacbb94 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": "a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd", | ||
+ "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2", | ||
"iso_checksum_type": "sha256", | ||
- "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", | ||
+ "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-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 fa0da36c1..cde3d1109 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": "a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd", | ||
+ "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2", | ||
"iso_checksum_type": "sha256", | ||
- "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", | ||
+ "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-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 8857f1299..9a114d361 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": "a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd", | ||
+ "iso_checksum": "45f873de9f8cb637345d6e66a583762730bbea30277ef7b32c9c3bd6700a32b2", | ||
"iso_checksum_type": "sha256", | ||
- "iso_url": "https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.3-live-server-amd64.iso", | ||
+ "iso_url": "https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso", | ||
"os_display_name": "Ubuntu 22.04", | ||
"shutdown_command": "shutdown -P now", | ||
"unmount_iso": "true" | ||
-- | ||
2.39.3 (Apple Git-146) | ||
|