Merge pull request #2875 from markusboehme/feature/default-to-cgroup-v2

Default to cgroup v2 for dev and k8s-1.26 variants
bottlerocket-os · Mar 10, 2023 · 24e7574 · 24e7574
2 parents a643681 + 40392e8
commit 24e7574
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/variants/aws-dev/Cargo.toml b/variants/aws-dev/Cargo.toml
@@ -9,6 +9,7 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 kernel-parameters = [

diff --git a/variants/aws-k8s-1.26-nvidia/Cargo.toml b/variants/aws-k8s-1.26-nvidia/Cargo.toml
@@ -14,6 +14,7 @@ os-image-size-gib = 4
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 included-packages = [

diff --git a/variants/aws-k8s-1.26/Cargo.toml b/variants/aws-k8s-1.26/Cargo.toml
@@ -11,6 +11,7 @@ exclude = ["README.md"]
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 included-packages = [

diff --git a/variants/metal-dev/Cargo.toml b/variants/metal-dev/Cargo.toml
@@ -12,6 +12,7 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = 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
@@ -15,6 +15,7 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 image-format = "raw"

diff --git a/variants/vmware-dev/Cargo.toml b/variants/vmware-dev/Cargo.toml
@@ -12,6 +12,7 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = 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
@@ -14,6 +14,7 @@ partition-plan = "unified"
 
 [package.metadata.build-variant.image-features]
 grub-set-private-var = true
+unified-cgroup-hierarchy = true
 
 [package.metadata.build-variant]
 image-format = "vmdk"