Merge pull request #1806 from flatcar/tormath1/linode

oem: provide akamai (linode) images
flatcar · Jun 21, 2024 · ab4e709 · ab4e709
2 parents 7e1045b + 101ef8c
commit ab4e709
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 1 deletion.
diff --git 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_<opt>.
 
 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/changelog/changes/2024-06-19-akamai.md 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))
diff --git 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}" \

diff --git a/...tainer/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service b/...tainer/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]

diff --git a/.../src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r8.ebuild b/.../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/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
 

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
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
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
@@ -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"