oem: provide proxmox images

Co-authored-by: Kai Lüke <pothos@users.noreply.github.com> Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
flatcar · Nov 12, 2024 · 21fc012 · 21fc012
1 parent 8d7e2c3
commit 21fc012
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 3 deletions.
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
@@ -25,6 +25,7 @@ VALID_IMG_TYPES=(
     openstack_mini
     packet
     parallels
+    proxmoxve
     pxe
     qemu_uefi
     rackspace
@@ -57,6 +58,7 @@ VALID_OEM_PACKAGES=(
     kubevirt
     openstack
     packet
+    proxmoxve
     qemu
     rackspace
     rackspace-onmetal
@@ -332,6 +334,13 @@ IMG_akamai_OEM_PACKAGE=common-oem-files
 IMG_akamai_OEM_USE=akamai
 IMG_akamai_OEM_SYSEXT=oem-akamai
 
+# proxmoxve
+IMG_proxmoxve_DISK_FORMAT=qcow2
+IMG_proxmoxve_DISK_LAYOUT=vm
+IMG_proxmoxve_OEM_PACKAGE=common-oem-files
+IMG_proxmoxve_OEM_USE=proxmoxve
+IMG_proxmoxve_OEM_SYSEXT=oem-proxmoxve
+
 ###########################################################
 
 # Print the default vm type for the specified board

diff --git a/changelog/changes/2024-10-24-proxmoxve.md b/changelog/changes/2024-10-24-proxmoxve.md
@@ -0,0 +1 @@
+- Added Proxmox Virtual Environment images ([scripts#1783](https://github.com/flatcar/scripts/pull/1783))
diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh
@@ -138,7 +138,7 @@ function _vm_build_impl() {
             COMPRESSION_FORMAT="bz2,none"
         elif [[ "${format}" =~ ^(hyperv|hyperv_vhdx)$ ]];then
             COMPRESSION_FORMAT="zip"
-        elif [[ "${format}" =~ ^(scaleway|kubevirt)$ ]];then
+        elif [[ "${format}" =~ ^(scaleway|kubevirt|proxmoxve)$ ]];then
             COMPRESSION_FORMAT="none"
         elif [[ "${format}" =~ ^(akamai)$ ]];then
             COMPRESSION_FORMAT="gz"

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
@@ -25,6 +25,8 @@ ConditionKernelCommandLine=|flatcar.oem.id=kubevirt
 
 ConditionKernelCommandLine=|flatcar.oem.id=akamai
 
+ConditionKernelCommandLine=|flatcar.oem.id=proxmoxve
+
 Description=Flatcar Metadata Agent
 
 [Service]

diff --git a/...on-oem-files/common-oem-files-0-r8.ebuild → ...on-oem-files/common-oem-files-0-r9.ebuild b/...on-oem-files/common-oem-files-0-r8.ebuild → ...on-oem-files/common-oem-files-0-r9.ebuild
@@ -35,6 +35,7 @@ COMMON_OEMIDS=(
     hetzner
     openstack
     packet
+    proxmoxve
     qemu
     scaleway
     kubevirt

diff --git a/...src/third_party/coreos-overlay/coreos-base/common-oem-files/files/proxmoxve/grub.cfg.frag b/...src/third_party/coreos-overlay/coreos-base/common-oem-files/files/proxmoxve/grub.cfg.frag
@@ -0,0 +1 @@
+set linux_append="flatcar.autologin"
diff --git a/...coreos-init/coreos-init-0.0.1-r196.ebuild → ...coreos-init/coreos-init-0.0.1-r197.ebuild b/...coreos-init/coreos-init-0.0.1-r196.ebuild → ...coreos-init/coreos-init-0.0.1-r197.ebuild
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
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://github.com/flatcar/init.git"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	EGIT_COMMIT="05b4b2aafbe706bdd65265c7a7103ed75fee14d2" # flatcar-master
+	EGIT_COMMIT="b5a6cbcfaabe605e28e075b8ac674edaf576a0eb" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-proxmoxve/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-proxmoxve/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/...container/src/third_party/coreos-overlay/coreos-base/oem-proxmoxve/oem-proxmoxve-0.ebuild b/...container/src/third_party/coreos-overlay/coreos-base/oem-proxmoxve/oem-proxmoxve-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 Proxmox VE"
+HOMEPAGE="https://www.proxmox.com/en/proxmox-virtual-environment/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+OEM_NAME="Proxmox VE"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/flatcar/bootengine.git"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	EGIT_COMMIT="f3c80fb02fe65dd3be2b0bb4727fc10985acfa9d" # flatcar-master
+	EGIT_COMMIT="c9de038b73621165f81573c77ca0d0c2f9e886db" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Added Proxmox Virtual Environment images ([scripts#1783](https://github.com/flatcar/scripts/pull/1783))