Merge pull request bottlerocket-os#4738 from rpkelly/whippet_migration

Richard Kelly · web-flow · commit 85ba19494096 · 2026-01-08T10:51:47.000-08:00
Whippet migration
diff --git a/variants/aws-k8s-1.29-fips/Cargo.toml b/variants/aws-k8s-1.29-fips/Cargo.toml
@@ -22,6 +22,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.29-nvidia/Cargo.toml b/variants/aws-k8s-1.29-nvidia/Cargo.toml
@@ -24,6 +24,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.29/Cargo.toml b/variants/aws-k8s-1.29/Cargo.toml
@@ -21,6 +21,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.30-fips/Cargo.toml b/variants/aws-k8s-1.30-fips/Cargo.toml
@@ -22,6 +22,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.30-nvidia/Cargo.toml b/variants/aws-k8s-1.30-nvidia/Cargo.toml
@@ -24,6 +24,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.30/Cargo.toml b/variants/aws-k8s-1.30/Cargo.toml
@@ -21,6 +21,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.31-fips/Cargo.toml b/variants/aws-k8s-1.31-fips/Cargo.toml
@@ -22,6 +22,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.31-nvidia/Cargo.toml b/variants/aws-k8s-1.31-nvidia/Cargo.toml
@@ -24,6 +24,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.31/Cargo.toml b/variants/aws-k8s-1.31/Cargo.toml
@@ -21,6 +21,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.32-fips/Cargo.toml b/variants/aws-k8s-1.32-fips/Cargo.toml
@@ -22,6 +22,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.32-nvidia/Cargo.toml b/variants/aws-k8s-1.32-nvidia/Cargo.toml
@@ -24,6 +24,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.32/Cargo.toml b/variants/aws-k8s-1.32/Cargo.toml
@@ -21,6 +21,7 @@ included-packages = [
 # core
     "release",
     "kernel-6.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.33-fips/Cargo.toml b/variants/aws-k8s-1.33-fips/Cargo.toml
@@ -24,6 +24,7 @@ included-packages = [
     "release",
     "kernel-6.1",
     "containerd-2.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.33-nvidia/Cargo.toml b/variants/aws-k8s-1.33-nvidia/Cargo.toml
@@ -26,6 +26,7 @@ included-packages = [
     "release",
     "kernel-6.12",
     "containerd-2.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/aws-k8s-1.33/Cargo.toml b/variants/aws-k8s-1.33/Cargo.toml
@@ -23,6 +23,7 @@ included-packages = [
     "release",
     "kernel-6.12",
     "containerd-2.1",
+    "whippet",
 # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/metal-dev/Cargo.toml b/variants/metal-dev/Cargo.toml
@@ -28,6 +28,7 @@ included-packages = [
     "release",
     "kernel-6.1",
     "linux-firmware",
+    "whippet",
 # docker
     "docker-cli",
     "docker-engine",
diff --git a/variants/vmware-k8s-1.29-fips/Cargo.toml b/variants/vmware-k8s-1.29-fips/Cargo.toml
@@ -35,6 +35,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.29/Cargo.toml b/variants/vmware-k8s-1.29/Cargo.toml
@@ -34,6 +34,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.30-fips/Cargo.toml b/variants/vmware-k8s-1.30-fips/Cargo.toml
@@ -35,6 +35,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.30/Cargo.toml b/variants/vmware-k8s-1.30/Cargo.toml
@@ -34,6 +34,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.31-fips/Cargo.toml b/variants/vmware-k8s-1.31-fips/Cargo.toml
@@ -35,6 +35,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.31/Cargo.toml b/variants/vmware-k8s-1.31/Cargo.toml
@@ -34,6 +34,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.32-fips/Cargo.toml b/variants/vmware-k8s-1.32-fips/Cargo.toml
@@ -35,6 +35,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.32/Cargo.toml b/variants/vmware-k8s-1.32/Cargo.toml
@@ -34,6 +34,7 @@ included-packages = [
     # core
     "release",
     "kernel-6.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.33-fips/Cargo.toml b/variants/vmware-k8s-1.33-fips/Cargo.toml
@@ -37,6 +37,7 @@ included-packages = [
     "release",
     "kernel-6.1",
     "containerd-2.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
diff --git a/variants/vmware-k8s-1.33/Cargo.toml b/variants/vmware-k8s-1.33/Cargo.toml
@@ -36,6 +36,7 @@ included-packages = [
     "release",
     "kernel-6.12",
     "containerd-2.1",
+    "whippet",
     # k8s
     "cni",
     "cni-plugins",
