Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

oem: provide akamai (linode) images #1806

Merged
merged 5 commits into from
Jun 21, 2024
Merged

oem: provide akamai (linode) images #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
441e10b
oem: provide akamai images
tormath1 Mar 27, 2024
663a382
coreos-base/afterburn: enable coreos-metadata on Akamai
tormath1 Apr 3, 2024
84a9cb3
coreos-base/coreos-init: bump commit ID
tormath1 Apr 3, 2024
0c1aa2a
ci-automation/vm: use gzip for akamai images
tormath1 Apr 23, 2024
101ef8c
changelog: add entry
tormath1 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions build_library/vm_image_util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# Default values use the format IMG_DEFAULT_<opt>.

VALID_IMG_TYPES=(
akamai
ami
ami_vmdk
azure
Expand Down Expand Up @@ -44,6 +45,7 @@ VALID_IMG_TYPES=(

#list of oem package names, minus the oem- prefix
VALID_OEM_PACKAGES=(
akamai
azure
cloudsigma
cloudstack
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions changelog/changes/2024-06-19-akamai.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Added Akamai / Linode images ([flatcar/scripts#1806](https://github.com/flatcar/scripts/pull/1806))
2 changes: 2 additions & 0 deletions ci-automation/vms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
2 changes: 2 additions & 0 deletions ...tainer/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ ConditionKernelCommandLine=|flatcar.oem.id=hetzner

ConditionKernelCommandLine=|flatcar.oem.id=kubevirt

ConditionKernelCommandLine=|flatcar.oem.id=akamai

Description=Flatcar Metadata Agent

[Service]
Expand Down
1 change: 1 addition & 0 deletions .../src/third_party/coreos-overlay/coreos-base/common-oem-files/common-oem-files-0-r8.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ if [[ ${1:-} = 'flatcar-local-variables' ]]; then
fi

COMMON_OEMIDS=(
akamai
ami
azure
hetzner
Expand Down
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
</pkgmetadata>
15 changes: 15 additions & 0 deletions sdk_container/src/third_party/coreos-overlay/coreos-base/oem-akamai/oem-akamai-0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Loading