netdog: switch to using supplements

bottlerocket-os · Feb 1, 2024 · 4d95728 · 4d95728
1 parent 3793ec6
commit 4d95728
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 23 deletions.
diff --git a/packages/libncurses/ncurses-6.4-20231209.tgz b/packages/libncurses/ncurses-6.4-20231209.tgz
diff --git a/packages/netdog/netdog.spec b/packages/netdog/netdog.spec
@@ -2,7 +2,7 @@
 %undefine _debugsource_packages
 
 Name: %{_cross_os}netdog
-Version: 0.1.1
+Version: 0.1.0
 Release: 0%{?dist}
 Summary: Bottlerocket network configuration helper
 License: Apache-2.0 OR MIT
@@ -27,13 +27,15 @@ Summary: Bottlerocket network configuration helper
 Provides: %{_cross_os}netdog = 2:
 Requires: %{_cross_os}systemd-networkd
 Requires: %{_cross_os}systemd-resolved
+Supplements: %{_cross_os}systemd-networkd
 %description -n %{_cross_os}netdog-systemd-networkd
 %{summary}.
 
 %package -n %{_cross_os}netdog-wicked
 Summary: Bottlerocket network configuration helper
 Provides: %{_cross_os}netdog = 1:
 Requires: %{_cross_os}wicked
+Supplements: %{_cross_os}wicked
 %description -n %{_cross_os}netdog-wicked
 %{summary}.
 
@@ -47,6 +49,7 @@ mkdir bin
 echo "** Build Netdog Binaries"
 %cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
     -p netdog \
+    --features default \
     --target-dir=${HOME}/.cache/networkd
 %cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
     -p netdog \
@@ -87,4 +90,4 @@ install -p -m 0644 %{S:20} %{buildroot}%{_cross_libdir}/systemd/resolved.conf.d
 posix.link("%{_cross_bindir}/netdog-wicked", "%{_cross_bindir}/netdog")
 
 %post -n %{_cross_os}netdog-systemd-networkd -p <lua>
-posix.link("%{_cross_bindir}/netdog-systemd-networkd", "%{_cross_bindir}/netdog")
+posix.link("%{_cross_bindir}/netdog-systemd-networkd", "%{_cross_bindir}/netdog")
diff --git a/sources/netdog/README.md b/sources/netdog/README.md
@@ -1,6 +1,6 @@
 # netdog
 
-Current version: 0.1.1
+Current version: 0.1.0
 
 ## Introduction
 

diff --git a/sources/netdog/src/main.rs b/sources/netdog/src/main.rs
@@ -24,7 +24,7 @@ valid example: `netdog.default-interface=eno1:dhcp4,dhcp6?`.
 The subcommand `write-resolv-conf` writes the resolv.conf, favoring DNS API settings and
 supplementing any missing settings with DNS settings from the primary interface's DHCP lease.  It
 is meant to be used as a restart command for DNS API settings.
- */
+*/
 
 #[macro_use]
 extern crate serde_plain;

diff --git a/sources/netdog/src/networkd/config/netdev.rs b/sources/netdog/src/networkd/config/netdev.rs
@@ -142,7 +142,7 @@ impl Display for NetDevMacAddress {
 }
 
 impl NetDevConfig {
-    const FILE_EXT: &'static str = "netdev";
+    const FILE_EXT: &str = "netdev";
 
     /// Write the config to the proper directory with the proper prefix and file extention
     pub(crate) fn write_config_file<P: AsRef<Path>>(&self, config_dir: P) -> Result<()> {

diff --git a/variants/aws-ecs-1-nvidia/Cargo.toml b/variants/aws-ecs-1-nvidia/Cargo.toml
@@ -20,7 +20,7 @@ included-packages = [
 # core
     "release",
     "kernel-5.10",
-    "netdog-wicked",
+    "wicked",
 # docker
     "docker-cli",
     "docker-engine",

diff --git a/variants/aws-ecs-1/Cargo.toml b/variants/aws-ecs-1/Cargo.toml
@@ -17,7 +17,7 @@ included-packages = [
 # core
     "release",
     "kernel-5.10",
-    "netdog-wicked",
+    "wicked",
 # docker
     "docker-cli",
     "docker-engine",

diff --git a/variants/aws-k8s-1.23-nvidia/Cargo.toml b/variants/aws-k8s-1.23-nvidia/Cargo.toml
@@ -21,7 +21,7 @@ included-packages = [
     "cni",
     "cni-plugins",
     "kernel-5.10",
-    "netdog-wicked",
+    "wicked",
     "kubelet-1.23",
     "release",
     "nvidia-container-toolkit",

diff --git a/variants/aws-k8s-1.23/Cargo.toml b/variants/aws-k8s-1.23/Cargo.toml
@@ -18,7 +18,7 @@ included-packages = [
     "cni",
     "cni-plugins",
     "kernel-5.10",
-    "netdog-wicked",
+    "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
@@ -21,7 +21,7 @@ included-packages = [
     "cni",
     "cni-plugins",
     "kernel-5.15",
-    "netdog-wicked",
+    "wicked",
     "kubelet-1.24",
     "release",
     "nvidia-container-toolkit",

diff --git a/variants/aws-k8s-1.24/Cargo.toml b/variants/aws-k8s-1.24/Cargo.toml
@@ -18,7 +18,7 @@ included-packages = [
     "cni",
     "cni-plugins",
     "kernel-5.15",
-    "netdog-wicked",
+    "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
@@ -22,7 +22,7 @@ included-packages = [
     "cni-plugins",
     "kernel-5.15",
     "kubelet-1.25",
-    "netdog-wicked",
+    "wicked",
     "release",
     "nvidia-container-toolkit",
     "nvidia-k8s-device-plugin",

diff --git a/variants/aws-k8s-1.25/Cargo.toml b/variants/aws-k8s-1.25/Cargo.toml
@@ -18,7 +18,7 @@ included-packages = [
     "cni",
     "cni-plugins",
     "kernel-5.15",
-    "netdog-wicked",
+    "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
@@ -23,7 +23,7 @@ included-packages = [
     "cni-plugins",
     "kernel-5.15",
     "kubelet-1.26",
-    "netdog-wicked",
+    "wicked",
     "release",
     "nvidia-container-toolkit",
     "nvidia-k8s-device-plugin",

diff --git a/variants/aws-k8s-1.26/Cargo.toml b/variants/aws-k8s-1.26/Cargo.toml
@@ -20,7 +20,7 @@ included-packages = [
     "cni-plugins",
     "kernel-5.15",
     "kubelet-1.26",
-    "netdog-wicked",
+    "wicked",
     "release",
 ]
 kernel-parameters = [

diff --git a/variants/aws-k8s-1.27-nvidia/Cargo.toml b/variants/aws-k8s-1.27-nvidia/Cargo.toml
@@ -27,7 +27,7 @@ included-packages = [
     "nvidia-container-toolkit",
     "nvidia-k8s-device-plugin",
     "kmod-5.15-nvidia-tesla-535",
-    "netdog-wicked",
+    "wicked",
 ]
 kernel-parameters = [
     "console=tty0",

diff --git a/variants/aws-k8s-1.27/Cargo.toml b/variants/aws-k8s-1.27/Cargo.toml
@@ -21,7 +21,7 @@ included-packages = [
     "kernel-5.15",
     "kubelet-1.27",
     "release",
-    "netdog-wicked",
+    "wicked",
 ]
 kernel-parameters = [
     "console=tty0",

diff --git a/variants/metal-k8s-1.25/Cargo.toml b/variants/metal-k8s-1.25/Cargo.toml
@@ -31,7 +31,7 @@ included-packages = [
     "linux-firmware",
     "kubelet-1.25",
     "release",
-    "netdog-wicked",
+    "wicked",
 ]
 
 [lib]

diff --git a/variants/metal-k8s-1.26/Cargo.toml b/variants/metal-k8s-1.26/Cargo.toml
@@ -32,7 +32,7 @@ included-packages = [
     "linux-firmware",
     "kubelet-1.26",
     "release",
-    "netdog-wicked",
+    "wicked",
 ]
 
 [lib]

diff --git a/variants/metal-k8s-1.27/Cargo.toml b/variants/metal-k8s-1.27/Cargo.toml
@@ -29,7 +29,7 @@ included-packages = [
     "cni",
     "cni-plugins",
     "kernel-5.15",
-    "netdog-wicked",
+    "wicked",
     "linux-firmware",
     "kubelet-1.27",
     "release",

diff --git a/variants/vmware-k8s-1.25/Cargo.toml b/variants/vmware-k8s-1.25/Cargo.toml
@@ -33,7 +33,7 @@ included-packages = [
     "kubelet-1.25",
     "open-vm-tools",
     "release",
-    "netdog-wicked",
+    "wicked",
     "vmware-netconfig",
 ]
 

diff --git a/variants/vmware-k8s-1.26/Cargo.toml b/variants/vmware-k8s-1.26/Cargo.toml
@@ -34,7 +34,7 @@ included-packages = [
     "kubelet-1.26",
     "open-vm-tools",
     "release",
-    "netdog-wicked",
+    "wicked",
     "vmware-netconfig",
 ]
 

diff --git a/variants/vmware-k8s-1.27/Cargo.toml b/variants/vmware-k8s-1.27/Cargo.toml
@@ -34,7 +34,7 @@ included-packages = [
     "kubelet-1.27",
     "open-vm-tools",
     "release",
-    "netdog-wicked",
+    "wicked",
     "vmware-netconfig",
 ]