From 88cb74bc38179e13295a51f093f143b49ec4d3a1 Mon Sep 17 00:00:00 2001 From: Jarrett Tierney Date: Fri, 19 Apr 2024 16:38:40 -0700 Subject: [PATCH] netdog: adjust variant files and symlink --- packages/netdog/Cargo.toml | 4 ++ packages/netdog/netdog.spec | 64 +++++++++++-------------- packages/os/os.spec | 2 - packages/release/Cargo.toml | 1 - sources/dogtag/README.md | 9 ++-- sources/dogtag/src/lib.rs | 19 +++++--- variants/Cargo.lock | 3 +- variants/aws-dev/Cargo.toml | 1 + variants/aws-ecs-1-nvidia/Cargo.toml | 1 - variants/aws-ecs-1/Cargo.toml | 1 - variants/aws-ecs-2-nvidia/Cargo.toml | 1 + variants/aws-ecs-2/Cargo.toml | 1 + variants/aws-k8s-1.23-nvidia/Cargo.toml | 1 - variants/aws-k8s-1.23/Cargo.toml | 1 - variants/aws-k8s-1.24-nvidia/Cargo.toml | 1 - variants/aws-k8s-1.24/Cargo.toml | 1 - variants/aws-k8s-1.25-nvidia/Cargo.toml | 1 - variants/aws-k8s-1.25/Cargo.toml | 1 - variants/aws-k8s-1.26-nvidia/Cargo.toml | 1 - variants/aws-k8s-1.26/Cargo.toml | 1 - variants/aws-k8s-1.27-nvidia/Cargo.toml | 1 - variants/aws-k8s-1.27/Cargo.toml | 1 - variants/aws-k8s-1.28-nvidia/Cargo.toml | 1 + variants/aws-k8s-1.28/Cargo.toml | 1 + variants/metal-dev/Cargo.toml | 1 + variants/metal-k8s-1.26/Cargo.toml | 1 - variants/metal-k8s-1.28/Cargo.toml | 1 + variants/vmware-dev/Cargo.toml | 1 + variants/vmware-k8s-1.26/Cargo.toml | 1 - variants/vmware-k8s-1.27/Cargo.toml | 1 - variants/vmware-k8s-1.28/Cargo.toml | 1 + 31 files changed, 62 insertions(+), 64 deletions(-) diff --git a/packages/netdog/Cargo.toml b/packages/netdog/Cargo.toml index 9bb12aa7a0e..29bec0f5e8f 100644 --- a/packages/netdog/Cargo.toml +++ b/packages/netdog/Cargo.toml @@ -17,3 +17,7 @@ source-groups = [ # RPM BuildRequires [build-dependencies] glibc = { path = "../glibc" } + +[dependencies] +wicked = { path = "../wicked" } +systemd = { path = "../systemd" } \ No newline at end of file diff --git a/packages/netdog/netdog.spec b/packages/netdog/netdog.spec index 917803dc397..780cf5821d8 100644 --- a/packages/netdog/netdog.spec +++ b/packages/netdog/netdog.spec @@ -8,7 +8,7 @@ Summary: Bottlerocket network configuration helper License: Apache-2.0 OR MIT URL: /~https://github.com/bottlerocket-os/bottlerocket -Source2: netdog-tmpfiles.conf +Source0: netdog-tmpfiles.conf Source10: run-netdog.mount Source11: write-network-status.service @@ -18,44 +18,38 @@ Source13: disable-udp-offload.service Source20: 00-resolved.conf BuildRequires: %{_cross_os}glibc-devel -Requires: %{_cross_os}netdog +Requires: %{_cross_os}hostname-reverse-dns +Requires: (%{_cross_os}hostname-imds if %{_cross_os}variant-platform(aws)) +Requires: (%{_cross_os}netdog-systemd-networkd if %{_cross_os}image-feature(systemd-networkd)) +Requires: (%{_cross_os}netdog-wicked if %{_cross_os}image-feature(no-systemd-networkd)) %description %{summary}. -%package -n %{_cross_os}netdog-common -Summary: Common configuration for Bottlerocket's network configuration helper -%description -n %{_cross_os}netdog-common -%{summary}. - -%package -n %{_cross_os}netdog-systemd-networkd +%package systemd-networkd Summary: Bottlerocket network configuration helper -Provides: %{_cross_os}netdog = 2: -Requires: %{_cross_os}netdog-common +Requires: %{_cross_os}netdog Requires: %{_cross_os}systemd-networkd Requires: %{_cross_os}systemd-resolved -Supplements: %{_cross_os}systemd-networkd +Conflicts: (%{_cross_os}netdog-wicked or %{_cross_os}image-feature(no-systemd-networkd)) %description -n %{_cross_os}netdog-systemd-networkd %{summary}. -%package -n %{_cross_os}netdog-wicked +%package wicked Summary: Bottlerocket network configuration helper -Provides: %{_cross_os}netdog = 1: -Requires: %{_cross_os}netdog-common +Requires: %{_cross_os}netdog Requires: %{_cross_os}wicked -Supplements: %{_cross_os}wicked +Conflicts: (%{_cross_os}netdog-systemd-networkd or %{_cross_os}image-feature(systemd-networkd)) %description -n %{_cross_os}netdog-wicked %{summary}. %package -n %{_cross_os}hostname-reverse-dns Summary: Reverse DNS Hostname detector -Supplements: %{_cross_os}netdog-common %description -n %{_cross_os}hostname-reverse-dns %{summary} %package -n %{_cross_os}hostname-imds Summary: IMDS Hostname detector -Supplements: %{_cross_os}netdog-common %description -n %{_cross_os}hostname-imds %{summary} @@ -66,7 +60,7 @@ Supplements: %{_cross_os}netdog-common %build mkdir bin -echo "** Build Dogtag Hostname Helpers" +echo "** Build Dogtag Hostname Detectors" %cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \ -p dogtag \ --bins \ @@ -83,16 +77,16 @@ echo "** Build Netdog Binaries" --target-dir=${HOME}/.cache/wicked %install -install -d %{buildroot}%{_cross_libexecdir}/hostname-resolvers -install -p -m 0755 ${HOME}/.cache/dogtag/%{__cargo_target}/release/20-imds %{buildroot}%{_cross_libexecdir}/hostname-resolvers/20-imds -install -p -m 0755 ${HOME}/.cache/dogtag/%{__cargo_target}/release/10-reverse-dns %{buildroot}%{_cross_libexecdir}/hostname-resolvers/10-reverse-dns +install -d %{buildroot}%{_cross_libexecdir}/hostname-detectors +install -p -m 0755 ${HOME}/.cache/dogtag/%{__cargo_target}/release/20-imds %{buildroot}%{_cross_libexecdir}/hostname-detectors/20-imds +install -p -m 0755 ${HOME}/.cache/dogtag/%{__cargo_target}/release/10-reverse-dns %{buildroot}%{_cross_libexecdir}/hostname-detectors/10-reverse-dns install -d %{buildroot}%{_cross_bindir} install -p -m 0755 ${HOME}/.cache/networkd/%{__cargo_target}/release/netdog %{buildroot}%{_cross_bindir}/netdog-systemd-networkd install -p -m 0755 ${HOME}/.cache/wicked/%{__cargo_target}/release/netdog %{buildroot}%{_cross_bindir}/netdog-wicked install -d %{buildroot}%{_cross_tmpfilesdir} -install -p -m 0644 %{S:2} %{buildroot}%{_cross_tmpfilesdir}/netdog.conf +install -p -m 0644 %{S:0} %{buildroot}%{_cross_tmpfilesdir}/netdog.conf install -d %{buildroot}%{_cross_unitdir} install -p -m 0644 %{S:10} %{S:11} %{S:12} %{S:13} %{buildroot}%{_cross_unitdir} @@ -101,29 +95,29 @@ install -d %{buildroot}%{_cross_libdir} install -d %{buildroot}%{_cross_libdir}/systemd/resolved.conf.d install -p -m 0644 %{S:20} %{buildroot}%{_cross_libdir}/systemd/resolved.conf.d -%post -n %{_cross_os}netdog-wicked -p -posix.link("%{_cross_bindir}/netdog-wicked", "%{_cross_bindir}/netdog") - -%post -n %{_cross_os}netdog-systemd-networkd -p -posix.link("%{_cross_bindir}/netdog-systemd-networkd", "%{_cross_bindir}/netdog") +%post wicked -p +posix.symlink("netdog-wicked", "%{_cross_bindir}/netdog") -%files -n %{_cross_os}hostname-reverse-dns -%{_cross_libexecdir}/hostname-resolvers/10-reverse-dns +%post systemd-networkd -p +posix.symlink("netdog-systemd-networkd", "%{_cross_bindir}/netdog") -%files -n %{_cross_os}hostname-imds -%{_cross_libexecdir}/hostname-resolvers/20-imds - -%files -n %{_cross_os}netdog-common +%files %{_cross_tmpfilesdir}/netdog.conf %{_cross_unitdir}/generate-network-config.service %{_cross_unitdir}/disable-udp-offload.service %{_cross_unitdir}/run-netdog.mount -%files -n %{_cross_os}netdog-systemd-networkd +%files -n %{_cross_os}hostname-reverse-dns +%{_cross_libexecdir}/hostname-detectors/10-reverse-dns + +%files -n %{_cross_os}hostname-imds +%{_cross_libexecdir}/hostname-detectors/20-imds + +%files systemd-networkd %{_cross_bindir}/netdog-systemd-networkd %{_cross_unitdir}/write-network-status.service %dir %{_cross_libdir}/systemd/resolved.conf.d %{_cross_libdir}/systemd/resolved.conf.d/00-resolved.conf -%files -n %{_cross_os}netdog-wicked +%files wicked %{_cross_bindir}/netdog-wicked diff --git a/packages/os/os.spec b/packages/os/os.spec index 722a4cdf86f..d4811a2c70b 100644 --- a/packages/os/os.spec +++ b/packages/os/os.spec @@ -507,8 +507,6 @@ install -p -m 0644 \ %{S:113} %{S:114} %{S:119} %{S:122} \ %{buildroot}%{_cross_unitdir} - - %if %{with nvidia_flavor} sed -e 's|PREFIX|%{_cross_prefix}|g' %{S:115} > link-kernel-modules.service sed -e 's|PREFIX|%{_cross_prefix}|g' %{S:116} > load-kernel-modules.service diff --git a/packages/release/Cargo.toml b/packages/release/Cargo.toml index 3e200f191c7..e238a337942 100644 --- a/packages/release/Cargo.toml +++ b/packages/release/Cargo.toml @@ -48,5 +48,4 @@ selinux-policy = { path = "../selinux-policy" } shim = { path = "../shim" } systemd = { path = "../systemd" } util-linux = { path = "../util-linux" } -wicked = { path = "../wicked" } xfsprogs = { path = "../xfsprogs" } diff --git a/sources/dogtag/README.md b/sources/dogtag/README.md index 875a509d7a2..d28f6c648dd 100644 --- a/sources/dogtag/README.md +++ b/sources/dogtag/README.md @@ -2,14 +2,17 @@ Current version: 0.1.0 -dogtag resolves the hostname of a bottlerocket server/instance. It's used to generate settings.network.hostname. To accomplish this, it uses a set of standalone binaries in /var/bottlerocket/dogtag that resolve the hostname via different methods. +dogtag detects the hostname of a bottlerocket server/instance. It's used to generate settings.network.hostname. +To accomplish this, it uses a set of standalone binaries in /usr/libexec/hostname-detectors that detect the hostname via different methods. -Currently, bottlerocket ships with two hostname resolver binaries: +Currently, bottlerocket ships with two hostname detector binaries: 20-imds - Fetches hostname from EC2 Instance Metadata Service 10-reverse-dns - Uses reverse DNS lookup to resolve the hostname -dogtag runs the resolvers in /var/bottlerocket/dogtag in reverse alphanumerical order until one of them returns a hostname, at which point it will exit early and print the returned hostname to stdout. +dogtag runs the detectors in /usr/libexec/hostname-detectors in reverse alphanumerical order until one of them returns a hostname, +at which point it will exit early and print the returned hostname to stdout. If none of the detectors detect the hostname the +ip address is returned. ## Colophon diff --git a/sources/dogtag/src/lib.rs b/sources/dogtag/src/lib.rs index 32cf360e287..d9e617855a0 100644 --- a/sources/dogtag/src/lib.rs +++ b/sources/dogtag/src/lib.rs @@ -1,12 +1,15 @@ /*! -dogtag resolves the hostname of a bottlerocket server/instance. It's used to generate settings.network.hostname. To accomplish this, it uses a set of standalone binaries in /var/bottlerocket/dogtag that resolve the hostname via different methods. +dogtag detects the hostname of a bottlerocket server/instance. It's used to generate settings.network.hostname. +To accomplish this, it uses a set of standalone binaries in /usr/libexec/hostname-detectors that detect the hostname via different methods. -Currently, bottlerocket ships with two hostname resolver binaries: +Currently, bottlerocket ships with two hostname detector binaries: 20-imds - Fetches hostname from EC2 Instance Metadata Service 10-reverse-dns - Uses reverse DNS lookup to resolve the hostname -dogtag runs the resolvers in /var/bottlerocket/dogtag in reverse alphanumerical order until one of them returns a hostname, at which point it will exit early and print the returned hostname to stdout. +dogtag runs the detectors in /usr/libexec/hostname-detectors in reverse alphanumerical order until one of them returns a hostname, +at which point it will exit early and print the returned hostname to stdout. If none of the detectors detect the hostname the +ip address is returned. */ use argh::FromArgs; use log::debug; @@ -15,7 +18,7 @@ use std::net::IpAddr; use std::{path::PathBuf, process}; use walkdir::WalkDir; -const DOGTAG_BIN_PATH: &str = "/usr/libexec/hostname-resolvers"; +const DOGTAG_BIN_PATH: &str = "/usr/libexec/hostname-detectors"; /// Cli defines the standard cmdline interface for all hostname handlers #[derive(FromArgs)] @@ -28,10 +31,10 @@ pub struct Cli { pub type Result = std::result::Result; -/// find_hostname will utilize the helpers located in /var/bottlerocket/dogtag/ to try and discover the hostname +/// find_hostname will utilize the helpers located in /usr/libexec/hostname-detectors to try and discover the hostname pub async fn find_hostname(ip_addr: IpAddr) -> Result { debug!( - "attempting to discover hostname helpers in {}", + "attempting to discover hostname detectors in {}", DOGTAG_BIN_PATH ); // We want to do reverse sort as we want to prioritize higher numbers first @@ -64,7 +67,9 @@ pub async fn find_hostname(ip_addr: IpAddr) -> Result { } } } - Err(error::Error::NoHelper {}) + // If we fail to find a hostname return the provided ip address sanitized + Ok(ip_addr.to_string() + .replace(":", "-")) } pub mod error { diff --git a/variants/Cargo.lock b/variants/Cargo.lock index 79a0bf9248e..e9f23dc9bf3 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -1056,6 +1056,8 @@ name = "netdog" version = "0.1.0" dependencies = [ "glibc", + "systemd", + "wicked", ] [[package]] @@ -1169,7 +1171,6 @@ dependencies = [ "shim", "systemd", "util-linux", - "wicked", "xfsprogs", ] diff --git a/variants/aws-dev/Cargo.toml b/variants/aws-dev/Cargo.toml index 9287024fcd5..bfa9456c43c 100644 --- a/variants/aws-dev/Cargo.toml +++ b/variants/aws-dev/Cargo.toml @@ -12,6 +12,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true xfs-data-partition = true uefi-secure-boot = true +systemd-networkd = true [package.metadata.build-variant] kernel-parameters = [ diff --git a/variants/aws-ecs-1-nvidia/Cargo.toml b/variants/aws-ecs-1-nvidia/Cargo.toml index 79929e31558..015f348d414 100644 --- a/variants/aws-ecs-1-nvidia/Cargo.toml +++ b/variants/aws-ecs-1-nvidia/Cargo.toml @@ -20,7 +20,6 @@ included-packages = [ # core "release", "kernel-5.10", - "wicked", # docker "docker-cli", "docker-engine", diff --git a/variants/aws-ecs-1/Cargo.toml b/variants/aws-ecs-1/Cargo.toml index 4200594e2f2..3d53e68b097 100644 --- a/variants/aws-ecs-1/Cargo.toml +++ b/variants/aws-ecs-1/Cargo.toml @@ -17,7 +17,6 @@ included-packages = [ # core "release", "kernel-5.10", - "wicked", # docker "docker-cli", "docker-engine", diff --git a/variants/aws-ecs-2-nvidia/Cargo.toml b/variants/aws-ecs-2-nvidia/Cargo.toml index 0e3f51e98e9..2ace1284361 100644 --- a/variants/aws-ecs-2-nvidia/Cargo.toml +++ b/variants/aws-ecs-2-nvidia/Cargo.toml @@ -10,6 +10,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true uefi-secure-boot = true xfs-data-partition = true +systemd-networkd = true [package.metadata.build-variant.image-layout] os-image-size-gib = 4 diff --git a/variants/aws-ecs-2/Cargo.toml b/variants/aws-ecs-2/Cargo.toml index ec9d4967db7..d307bb3abc5 100644 --- a/variants/aws-ecs-2/Cargo.toml +++ b/variants/aws-ecs-2/Cargo.toml @@ -12,6 +12,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true uefi-secure-boot = true xfs-data-partition = true +systemd-networkd = true [package.metadata.build-variant] included-packages = [ diff --git a/variants/aws-k8s-1.23-nvidia/Cargo.toml b/variants/aws-k8s-1.23-nvidia/Cargo.toml index 4b52d27c772..71dad8886d4 100644 --- a/variants/aws-k8s-1.23-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.23-nvidia/Cargo.toml @@ -21,7 +21,6 @@ included-packages = [ "cni", "cni-plugins", "kernel-5.10", - "wicked", "kubelet-1.23", "release", "nvidia-container-toolkit-k8s", diff --git a/variants/aws-k8s-1.23/Cargo.toml b/variants/aws-k8s-1.23/Cargo.toml index aa66adfa1ee..60cb5dbbf8e 100644 --- a/variants/aws-k8s-1.23/Cargo.toml +++ b/variants/aws-k8s-1.23/Cargo.toml @@ -18,7 +18,6 @@ included-packages = [ "cni", "cni-plugins", "kernel-5.10", - "wicked", "kubelet-1.23", "release", ] diff --git a/variants/aws-k8s-1.24-nvidia/Cargo.toml b/variants/aws-k8s-1.24-nvidia/Cargo.toml index f51830556ad..6f3bc8a1233 100644 --- a/variants/aws-k8s-1.24-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.24-nvidia/Cargo.toml @@ -21,7 +21,6 @@ included-packages = [ "cni", "cni-plugins", "kernel-5.15", - "wicked", "kubelet-1.24", "release", "nvidia-container-toolkit-k8s", diff --git a/variants/aws-k8s-1.24/Cargo.toml b/variants/aws-k8s-1.24/Cargo.toml index 196540ea132..8d9298896a0 100644 --- a/variants/aws-k8s-1.24/Cargo.toml +++ b/variants/aws-k8s-1.24/Cargo.toml @@ -18,7 +18,6 @@ included-packages = [ "cni", "cni-plugins", "kernel-5.15", - "wicked", "kubelet-1.24", "release", ] diff --git a/variants/aws-k8s-1.25-nvidia/Cargo.toml b/variants/aws-k8s-1.25-nvidia/Cargo.toml index ce3dad7a3d4..9e59896d1a8 100644 --- a/variants/aws-k8s-1.25-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.25-nvidia/Cargo.toml @@ -22,7 +22,6 @@ included-packages = [ "cni-plugins", "kernel-5.15", "kubelet-1.25", - "wicked", "release", "nvidia-container-toolkit-k8s", "nvidia-k8s-device-plugin", diff --git a/variants/aws-k8s-1.25/Cargo.toml b/variants/aws-k8s-1.25/Cargo.toml index 77b137b8fbf..4eeb4a2614c 100644 --- a/variants/aws-k8s-1.25/Cargo.toml +++ b/variants/aws-k8s-1.25/Cargo.toml @@ -18,7 +18,6 @@ included-packages = [ "cni", "cni-plugins", "kernel-5.15", - "wicked", "kubelet-1.25", "release", ] diff --git a/variants/aws-k8s-1.26-nvidia/Cargo.toml b/variants/aws-k8s-1.26-nvidia/Cargo.toml index 8715caad379..dadd6b69c54 100644 --- a/variants/aws-k8s-1.26-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.26-nvidia/Cargo.toml @@ -23,7 +23,6 @@ included-packages = [ "cni-plugins", "kernel-5.15", "kubelet-1.26", - "wicked", "release", "nvidia-container-toolkit-k8s", "nvidia-k8s-device-plugin", diff --git a/variants/aws-k8s-1.26/Cargo.toml b/variants/aws-k8s-1.26/Cargo.toml index 97b283d7fd9..fc9ec230f3e 100644 --- a/variants/aws-k8s-1.26/Cargo.toml +++ b/variants/aws-k8s-1.26/Cargo.toml @@ -20,7 +20,6 @@ included-packages = [ "cni-plugins", "kernel-5.15", "kubelet-1.26", - "wicked", "release", ] kernel-parameters = [ diff --git a/variants/aws-k8s-1.27-nvidia/Cargo.toml b/variants/aws-k8s-1.27-nvidia/Cargo.toml index 72d3bee1f63..f15ab848b62 100644 --- a/variants/aws-k8s-1.27-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.27-nvidia/Cargo.toml @@ -27,7 +27,6 @@ included-packages = [ "nvidia-container-toolkit-k8s", "nvidia-k8s-device-plugin", "kmod-5.15-nvidia-tesla-535", - "wicked", ] kernel-parameters = [ "console=tty0", diff --git a/variants/aws-k8s-1.27/Cargo.toml b/variants/aws-k8s-1.27/Cargo.toml index b247abeabe5..eff3ed053f6 100644 --- a/variants/aws-k8s-1.27/Cargo.toml +++ b/variants/aws-k8s-1.27/Cargo.toml @@ -21,7 +21,6 @@ included-packages = [ "kernel-5.15", "kubelet-1.27", "release", - "wicked", ] kernel-parameters = [ "console=tty0", diff --git a/variants/aws-k8s-1.28-nvidia/Cargo.toml b/variants/aws-k8s-1.28-nvidia/Cargo.toml index 05270fa0e1b..4a740cef9c2 100644 --- a/variants/aws-k8s-1.28-nvidia/Cargo.toml +++ b/variants/aws-k8s-1.28-nvidia/Cargo.toml @@ -17,6 +17,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true uefi-secure-boot = true xfs-data-partition = true +systemd-networkd = true [package.metadata.build-variant] included-packages = [ diff --git a/variants/aws-k8s-1.28/Cargo.toml b/variants/aws-k8s-1.28/Cargo.toml index d8b7e4a01b1..676cd9a428b 100644 --- a/variants/aws-k8s-1.28/Cargo.toml +++ b/variants/aws-k8s-1.28/Cargo.toml @@ -14,6 +14,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true uefi-secure-boot = true xfs-data-partition = true +systemd-networkd = true [package.metadata.build-variant] included-packages = [ diff --git a/variants/metal-dev/Cargo.toml b/variants/metal-dev/Cargo.toml index 184c23c1a7b..553d40f28bd 100644 --- a/variants/metal-dev/Cargo.toml +++ b/variants/metal-dev/Cargo.toml @@ -15,6 +15,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true xfs-data-partition = true uefi-secure-boot = true +systemd-networkd = true [package.metadata.build-variant] image-format = "raw" diff --git a/variants/metal-k8s-1.26/Cargo.toml b/variants/metal-k8s-1.26/Cargo.toml index 9346e1967f6..bd0dbe73062 100644 --- a/variants/metal-k8s-1.26/Cargo.toml +++ b/variants/metal-k8s-1.26/Cargo.toml @@ -32,7 +32,6 @@ included-packages = [ "linux-firmware", "kubelet-1.26", "release", - "wicked", ] [lib] diff --git a/variants/metal-k8s-1.28/Cargo.toml b/variants/metal-k8s-1.28/Cargo.toml index f28fe623f58..d299e0252ee 100644 --- a/variants/metal-k8s-1.28/Cargo.toml +++ b/variants/metal-k8s-1.28/Cargo.toml @@ -18,6 +18,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true uefi-secure-boot = true xfs-data-partition = true +systemd-networkd = true [package.metadata.build-variant] image-format = "raw" diff --git a/variants/vmware-dev/Cargo.toml b/variants/vmware-dev/Cargo.toml index 452ea1d23a5..2dec382d40f 100644 --- a/variants/vmware-dev/Cargo.toml +++ b/variants/vmware-dev/Cargo.toml @@ -15,6 +15,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true xfs-data-partition = true uefi-secure-boot = true +systemd-networkd = true [package.metadata.build-variant] image-format = "vmdk" diff --git a/variants/vmware-k8s-1.26/Cargo.toml b/variants/vmware-k8s-1.26/Cargo.toml index d51f8376485..12e825e93c4 100644 --- a/variants/vmware-k8s-1.26/Cargo.toml +++ b/variants/vmware-k8s-1.26/Cargo.toml @@ -34,7 +34,6 @@ included-packages = [ "kubelet-1.26", "open-vm-tools", "release", - "wicked", ] [lib] diff --git a/variants/vmware-k8s-1.27/Cargo.toml b/variants/vmware-k8s-1.27/Cargo.toml index 3cd075d189d..df957f6dade 100644 --- a/variants/vmware-k8s-1.27/Cargo.toml +++ b/variants/vmware-k8s-1.27/Cargo.toml @@ -34,7 +34,6 @@ included-packages = [ "kubelet-1.27", "open-vm-tools", "release", - "wicked", ] [lib] diff --git a/variants/vmware-k8s-1.28/Cargo.toml b/variants/vmware-k8s-1.28/Cargo.toml index 8f1cd493d03..b0bae19e4b3 100644 --- a/variants/vmware-k8s-1.28/Cargo.toml +++ b/variants/vmware-k8s-1.28/Cargo.toml @@ -17,6 +17,7 @@ grub-set-private-var = true unified-cgroup-hierarchy = true uefi-secure-boot = true xfs-data-partition = true +systemd-networkd = true [package.metadata.build-variant] image-format = "vmdk"