Merge pull request #3394 from zmrow/networkd-1.28-ecs2

Use `systemd-networkd` for `aws-ecs-2` and k8s 1.28 variants
bottlerocket-os · Sep 11, 2023 · 4fcc667 · 4fcc667
2 parents 703692e + f8c45fc
commit 4fcc667
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 0 deletions.
diff --git 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-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
@@ -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.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
@@ -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
@@ -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.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
@@ -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.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"