From 441e10bec594da7e1df4a4e7587f244a19ebf3a2 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 27 Mar 2024 16:25:58 +0100 Subject: [PATCH 1/5] oem: provide akamai images Signed-off-by: Mathieu Tortuyaux --- build_library/vm_image_util.sh | 7 +++++++ .../common-oem-files/common-oem-files-0-r8.ebuild | 1 + .../coreos-base/oem-akamai/metadata.xml | 4 ++++ .../coreos-base/oem-akamai/oem-akamai-0.ebuild | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/oem-akamai-0.ebuild diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 1b61232e6b..cd0a3745a5 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -6,6 +6,7 @@ # Default values use the format IMG_DEFAULT_. VALID_IMG_TYPES=( + akamai ami ami_vmdk azure @@ -44,6 +45,7 @@ VALID_IMG_TYPES=( #list of oem package names, minus the oem- prefix VALID_OEM_PACKAGES=( + akamai azure cloudsigma cloudstack @@ -325,6 +327,11 @@ IMG_kubevirt_OEM_USE=kubevirt IMG_kubevirt_OEM_SYSEXT=oem-kubevirt IMG_kubevirt_DISK_EXTENSION=qcow2 +## akamai (Linode) +IMG_akamai_OEM_PACKAGE=common-oem-files +IMG_akamai_OEM_USE=akamai +IMG_akamai_OEM_SYSEXT=oem-akamai + ########################################################### # Print the default vm type for the specified board diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r8.ebuild index 705942df0d..9c69deac34 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r8.ebuild @@ -29,6 +29,7 @@ if [[ ${1:-} = 'flatcar-local-variables' ]]; then fi COMMON_OEMIDS=( + akamai ami azure hetzner diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/metadata.xml new file mode 100644 index 0000000000..097975e3ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/metadata.xml @@ -0,0 +1,4 @@ + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/oem-akamai-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/oem-akamai-0.ebuild new file mode 100644 index 0000000000..c0e36a012e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/oem-akamai-0.ebuild @@ -0,0 +1,15 @@ +# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OEM suite for Akamai (previously Linode)" +HOMEPAGE="https://www.linode.com" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm64" +IUSE="" + +OEM_NAME="Akamai" From 663a38243261007f45dd4ef23f2b1ca328b37b94 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 3 Apr 2024 17:38:07 +0200 Subject: [PATCH 2/5] coreos-base/afterburn: enable coreos-metadata on Akamai Signed-off-by: Mathieu Tortuyaux --- .../coreos-base/afterburn/files/coreos-metadata.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service index 439a48bf1a..facc01224d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service @@ -23,6 +23,8 @@ ConditionKernelCommandLine=|flatcar.oem.id=hetzner ConditionKernelCommandLine=|flatcar.oem.id=kubevirt +ConditionKernelCommandLine=|flatcar.oem.id=akamai + Description=Flatcar Metadata Agent [Service] From 84a9cb3585dceb22b17fecec2d3644ab267912f4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 3 Apr 2024 17:43:35 +0200 Subject: [PATCH 3/5] coreos-base/coreos-init: bump commit ID This pulls Akamai SSH keys service enabling Signed-off-by: Mathieu Tortuyaux --- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index cbfe1bbbb6..dae32f390c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="33b692d9d67e8d9b09378bb2be2a66d1aa439a15" # flatcar-master + CROS_WORKON_COMMIT="05e3d8b9c0f8e95d5044db5133b3e75d205f6d91" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 0c1aa2a3e2235c3b9e49554f1a40535329533ecd Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 23 Apr 2024 10:14:18 +0200 Subject: [PATCH 4/5] ci-automation/vm: use gzip for akamai images akamai expects gzipped images when uploading an image. Signed-off-by: Mathieu Tortuyaux --- ci-automation/vms.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh index 8c86f67b2a..79156b4d69 100644 --- a/ci-automation/vms.sh +++ b/ci-automation/vms.sh @@ -140,6 +140,8 @@ function _vm_build_impl() { COMPRESSION_FORMAT="zip" elif [[ "${format}" =~ ^(scaleway|kubevirt)$ ]];then COMPRESSION_FORMAT="none" + elif [[ "${format}" =~ ^(akamai)$ ]];then + COMPRESSION_FORMAT="gz" fi ./run_sdk_container -n "${vms_container}" -C "${packages_image}" \ -v "${vernum}" \ From 101ef8c4f38bba1972210cb34ee1535db8af948c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 19 Jun 2024 11:48:45 +0200 Subject: [PATCH 5/5] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/changes/2024-06-19-akamai.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2024-06-19-akamai.md diff --git a/changelog/changes/2024-06-19-akamai.md b/changelog/changes/2024-06-19-akamai.md new file mode 100644 index 0000000000..64e6570272 --- /dev/null +++ b/changelog/changes/2024-06-19-akamai.md @@ -0,0 +1 @@ +- Added Akamai / Linode images ([flatcar/scripts#1806](https://github.com/flatcar/scripts/pull/1806))