-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Kai Lüke <pothos@users.noreply.github.com> Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
- Loading branch information
Showing
7 changed files
with
97 additions
and
0 deletions.
There are no files selected for viewing
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
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 @@ | ||
- Added Proxmox Virtual Environment images ([scripts#1783](https://github.com/flatcar/scripts/pull/1783)) |
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 |
---|---|---|
|
@@ -35,6 +35,7 @@ COMMON_OEMIDS=( | |
hetzner | ||
openstack | ||
packet | ||
proxmoxve | ||
qemu | ||
scaleway | ||
kubevirt | ||
|
4 changes: 4 additions & 0 deletions
4
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-proxmoxve/metadata.xml
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,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
15
...container/src/third_party/coreos-overlay/coreos-base/oem-proxmoxve/oem-proxmoxve-0.ebuild
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,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" |
27 changes: 27 additions & 0 deletions
27
...iner/src/third_party/coreos-overlay/coreos/user-patches/coreos-base/coreos-init/115.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,27 @@ | ||
From 67ac31d0fc9ed22d83f2fc5a6449c6e35a83a1df Mon Sep 17 00:00:00 2001 | ||
From: Kai Lueke <kailuke@microsoft.com> | ||
Date: Fri, 22 Mar 2024 20:58:23 +0900 | ||
Subject: [PATCH] Draft for Proxmox support | ||
|
||
This makes use of https://github.com/coreos/afterburn/pull/1023 | ||
to set up the ssh keys from the metadata. | ||
|
||
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com> | ||
--- | ||
systemd/system/sshkeys.service | 3 +++ | ||
1 file changed, 3 insertions(+) | ||
|
||
diff --git a/systemd/system/sshkeys.service b/systemd/system/sshkeys.service | ||
index 7727185..9edf5cc 100644 | ||
--- a/systemd/system/sshkeys.service | ||
+++ b/systemd/system/sshkeys.service | ||
@@ -30,6 +30,9 @@ ConditionKernelCommandLine=|flatcar.oem.id=hetzner | ||
ConditionKernelCommandLine=|ignition.platform.id=akamai | ||
ConditionKernelCommandLine=|flatcar.oem.id=akamai | ||
|
||
+ConditionKernelCommandLine=|ignition.platform.id=proxmoxve | ||
+ConditionKernelCommandLine=|flatcar.oem.id=proxmoxve | ||
+ | ||
[Service] | ||
Type=oneshot | ||
RemainAfterExit=yes |
40 changes: 40 additions & 0 deletions
40
...ntainer/src/third_party/coreos-overlay/coreos/user-patches/sys-kernel/bootengine/91.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,40 @@ | ||
From 10357a387459fc16a381f70601c44313668076ed Mon Sep 17 00:00:00 2001 | ||
From: Kai Lueke <kailuke@microsoft.com> | ||
Date: Fri, 22 Mar 2024 20:23:49 +0900 | ||
Subject: [PATCH] Draft for Proxmox support | ||
|
||
This makes use of https://github.com/coreos/afterburn/pull/1023 | ||
to set up any static networking from the initrd (for Ignition) and the | ||
hostname (early enough so that Ignition could overwrite it). | ||
--- | ||
dracut/30ignition/flatcar-metadata-hostname.service | 2 ++ | ||
dracut/30ignition/ignition-generator | 2 +- | ||
2 files changed, 3 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/dracut/30ignition/flatcar-metadata-hostname.service b/dracut/30ignition/flatcar-metadata-hostname.service | ||
index fc75732..323c62e 100644 | ||
--- a/dracut/30ignition/flatcar-metadata-hostname.service | ||
+++ b/dracut/30ignition/flatcar-metadata-hostname.service | ||
@@ -33,8 +33,10 @@ ConditionKernelCommandLine=|flatcar.oem.id=vultr | ||
# Addition: | ||
ConditionKernelCommandLine=|coreos.oem.id=packet | ||
ConditionKernelCommandLine=|flatcar.oem.id=packet | ||
+ | ||
ConditionKernelCommandLine=|flatcar.oem.id=hetzner | ||
ConditionKernelCommandLine=|flatcar.oem.id=kubevirt | ||
+ConditionKernelCommandLine=|flatcar.oem.id=proxmoxve | ||
|
||
OnFailure=emergency.target | ||
OnFailureJobMode=isolate | ||
diff --git a/dracut/30ignition/ignition-generator b/dracut/30ignition/ignition-generator | ||
index 59bdf80..c015ff5 100755 | ||
--- a/dracut/30ignition/ignition-generator | ||
+++ b/dracut/30ignition/ignition-generator | ||
@@ -146,6 +146,6 @@ if [ "${nopxe}" = 1 ]; then | ||
add_requires "disk-uuid.service" initrd.target | ||
fi | ||
|
||
-if [[ $(cmdline_arg flatcar.oem.id) == "digitalocean" ]] || [[ $(cmdline_arg coreos.oem.id) == "digitalocean" ]]; then | ||
+if [[ $(cmdline_arg flatcar.oem.id) == "digitalocean" ]] || [[ $(cmdline_arg coreos.oem.id) == "digitalocean" ]] || [[ $(cmdline_arg flatcar.oem.id) == "proxmoxve" ]]; then | ||
add_requires flatcar-digitalocean-network.service initrd.target | ||
fi |