From ebc4b0ba9cba9103f65d309c5dace451192d2bd4 Mon Sep 17 00:00:00 2001 From: Piyush Jena Date: Wed, 11 Mar 2026 17:13:22 -0700 Subject: [PATCH 1/4] settings-plugins: drop k8s-1.29 Signed-off-by: Piyush Jena --- packages/settings-plugins/settings-plugins.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/settings-plugins/settings-plugins.spec b/packages/settings-plugins/settings-plugins.spec index 514fd97ebc8..93c5b5b686a 100644 --- a/packages/settings-plugins/settings-plugins.spec +++ b/packages/settings-plugins/settings-plugins.spec @@ -70,8 +70,6 @@ Conflicts: %{_cross_os}settings-plugin(any) Summary: Settings plugin for the aws-k8s variants Requires: %{_cross_os}variant-family(aws-k8s) Provides: %{_cross_os}settings-plugin(any) -Provides: %{_cross_os}settings-plugin(aws-k8s-1.29) -Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-fips) Provides: %{_cross_os}settings-plugin(aws-k8s-1.30) Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-fips) Provides: %{_cross_os}settings-plugin(aws-k8s-1.31) @@ -95,8 +93,6 @@ Conflicts: %{_cross_os}variant-flavor(nvidia) Summary: Settings plugin for the aws-k8s-nvidia variants Requires: (%{_cross_os}variant-family(aws-k8s) and %{_cross_os}variant-flavor(nvidia)) Provides: %{_cross_os}settings-plugin(any) -Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-nvidia) -Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-nvidia-fips) Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia) Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia-fips) Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-nvidia) @@ -138,8 +134,6 @@ Conflicts: %{_cross_os}settings-plugin(any) Summary: Settings plugin for the vmware-k8s variants Requires: %{_cross_os}variant-family(vmware-k8s) Provides: %{_cross_os}settings-plugin(any) -Provides: %{_cross_os}settings-plugin(vmware-k8s-1.29) -Provides: %{_cross_os}settings-plugin(vmware-k8s-1.29-fips) Provides: %{_cross_os}settings-plugin(vmware-k8s-1.30) Provides: %{_cross_os}settings-plugin(vmware-k8s-1.30-fips) Provides: %{_cross_os}settings-plugin(vmware-k8s-1.31) From 4e300188e05c284a45a2e9de1f8686accbeaff76 Mon Sep 17 00:00:00 2001 From: Piyush Jena Date: Wed, 11 Mar 2026 17:13:33 -0700 Subject: [PATCH 2/4] settings-defaults: drop k8s-1.29 Signed-off-by: Piyush Jena --- .../settings-defaults/settings-defaults.spec | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/settings-defaults/settings-defaults.spec b/packages/settings-defaults/settings-defaults.spec index fba605640dd..f84389f35df 100644 --- a/packages/settings-defaults/settings-defaults.spec +++ b/packages/settings-defaults/settings-defaults.spec @@ -84,18 +84,14 @@ Conflicts: %{_cross_os}settings-defaults(any) %{summary}. %package aws-k8s-1.31 -Summary: Settings defaults for the aws-k8s 1.29 through 1.31 variants +Summary: Settings defaults for the aws-k8s 1.30 through 1.31 variants Requires: (%{shrink: - %{_cross_os}variant(aws-k8s-1.29) or - %{_cross_os}variant(aws-k8s-1.29-fips) or %{_cross_os}variant(aws-k8s-1.30) or %{_cross_os}variant(aws-k8s-1.30-fips) or %{_cross_os}variant(aws-k8s-1.31) or %{_cross_os}variant(aws-k8s-1.31-fips) %{nil}}) Provides: %{_cross_os}settings-defaults(any) -Provides: %{_cross_os}settings-defaults(aws-k8s-1.29) -Provides: %{_cross_os}settings-defaults(aws-k8s-1.29-fips) Provides: %{_cross_os}settings-defaults(aws-k8s-1.30) Provides: %{_cross_os}settings-defaults(aws-k8s-1.30-fips) Provides: %{_cross_os}settings-defaults(aws-k8s-1.31) @@ -106,18 +102,14 @@ Conflicts: %{_cross_os}settings-defaults(any) %{summary}. %package aws-k8s-1.31-nvidia -Summary: Settings defaults for the aws-k8s 1.29 through 1.31 nvidia variants +Summary: Settings defaults for the aws-k8s 1.30 through 1.31 nvidia variants Requires: (%{shrink: - %{_cross_os}variant(aws-k8s-1.29-nvidia) or - %{_cross_os}variant(aws-k8s-1.29-nvidia-fips) or %{_cross_os}variant(aws-k8s-1.30-nvidia) or %{_cross_os}variant(aws-k8s-1.30-nvidia-fips) or %{_cross_os}variant(aws-k8s-1.31-nvidia) or %{_cross_os}variant(aws-k8s-1.31-nvidia-fips) %{nil}}) Provides: %{_cross_os}settings-defaults(any) -Provides: %{_cross_os}settings-defaults(aws-k8s-1.29-nvidia) -Provides: %{_cross_os}settings-defaults(aws-k8s-1.29-nvidia-fips) Provides: %{_cross_os}settings-defaults(aws-k8s-1.30-nvidia) Provides: %{_cross_os}settings-defaults(aws-k8s-1.30-nvidia-fips) Provides: %{_cross_os}settings-defaults(aws-k8s-1.31-nvidia) @@ -260,10 +252,8 @@ Conflicts: %{_cross_os}settings-defaults(any) %{summary}. %package vmware-k8s-1.32 -Summary: Settings defaults for the vmware-k8s 1.29 through 1.32 variants +Summary: Settings defaults for the vmware-k8s 1.30 through 1.32 variants Requires: (%{shrink: - %{_cross_os}variant(vmware-k8s-1.29) or - %{_cross_os}variant(vmware-k8s-1.29-fips) or %{_cross_os}variant(vmware-k8s-1.30) or %{_cross_os}variant(vmware-k8s-1.30-fips) or %{_cross_os}variant(vmware-k8s-1.31) or @@ -272,8 +262,6 @@ Requires: (%{shrink: %{_cross_os}variant(vmware-k8s-1.32-fips) %{nil}}) Provides: %{_cross_os}settings-defaults(any) -Provides: %{_cross_os}settings-defaults(vmware-k8s-1.29) -Provides: %{_cross_os}settings-defaults(vmware-k8s-1.29-fips) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30-fips) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31) From 364e42a8787671571fc5ddc2d7623a8ae13f96bb Mon Sep 17 00:00:00 2001 From: Piyush Jena Date: Mon, 16 Mar 2026 06:59:40 +0000 Subject: [PATCH 3/4] variants: drop k8s-1.29 Signed-off-by: Piyush Jena --- Cargo.lock | 54 ------------------ Cargo.toml | 6 -- variants/aws-k8s-1.29-fips/Cargo.toml | 47 ---------------- variants/aws-k8s-1.29-nvidia-fips/Cargo.toml | 55 ------------------- .../aws-k8s-1.29-nvidia-fips/amispec.toml | 1 - variants/aws-k8s-1.29-nvidia/Cargo.toml | 53 ------------------ variants/aws-k8s-1.29/Cargo.toml | 46 ---------------- variants/vmware-k8s-1.29-fips/Cargo.toml | 54 ------------------ variants/vmware-k8s-1.29-fips/template.ovf | 1 - variants/vmware-k8s-1.29/Cargo.toml | 53 ------------------ variants/vmware-k8s-1.29/template.ovf | 1 - 11 files changed, 371 deletions(-) delete mode 100644 variants/aws-k8s-1.29-fips/Cargo.toml delete mode 100644 variants/aws-k8s-1.29-nvidia-fips/Cargo.toml delete mode 120000 variants/aws-k8s-1.29-nvidia-fips/amispec.toml delete mode 100644 variants/aws-k8s-1.29-nvidia/Cargo.toml delete mode 100644 variants/aws-k8s-1.29/Cargo.toml delete mode 100644 variants/vmware-k8s-1.29-fips/Cargo.toml delete mode 120000 variants/vmware-k8s-1.29-fips/template.ovf delete mode 100644 variants/vmware-k8s-1.29/Cargo.toml delete mode 120000 variants/vmware-k8s-1.29/template.ovf diff --git a/Cargo.lock b/Cargo.lock index 19b0ccd746f..3a9a97093be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,42 +83,6 @@ dependencies = [ "settings-plugins", ] -[[package]] -name = "aws-k8s-1_29" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - -[[package]] -name = "aws-k8s-1_29-fips" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - -[[package]] -name = "aws-k8s-1_29-nvidia" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - -[[package]] -name = "aws-k8s-1_29-nvidia-fips" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - [[package]] name = "aws-k8s-1_30" version = "0.1.0" @@ -365,24 +329,6 @@ dependencies = [ "settings-plugins", ] -[[package]] -name = "vmware-k8s-1_29" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - -[[package]] -name = "vmware-k8s-1_29-fips" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - [[package]] name = "vmware-k8s-1_30" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 44253dacce9..aede8938c70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,6 @@ members = [ "variants/aws-ecs-3-fips", "variants/aws-ecs-3-nvidia", "variants/aws-ecs-3-nvidia-fips", - "variants/aws-k8s-1.29", - "variants/aws-k8s-1.29-fips", "variants/aws-k8s-1.30", "variants/aws-k8s-1.30-fips", "variants/aws-k8s-1.31", @@ -27,8 +25,6 @@ members = [ "variants/aws-k8s-1.34-fips", "variants/aws-k8s-1.35", "variants/aws-k8s-1.35-fips", - "variants/aws-k8s-1.29-nvidia", - "variants/aws-k8s-1.29-nvidia-fips", "variants/aws-k8s-1.30-nvidia", "variants/aws-k8s-1.30-nvidia-fips", "variants/aws-k8s-1.31-nvidia", @@ -43,8 +39,6 @@ members = [ "variants/aws-k8s-1.35-nvidia-fips", "variants/metal-dev", "variants/vmware-dev", - "variants/vmware-k8s-1.29", - "variants/vmware-k8s-1.29-fips", "variants/vmware-k8s-1.30", "variants/vmware-k8s-1.30-fips", "variants/vmware-k8s-1.31", diff --git a/variants/aws-k8s-1.29-fips/Cargo.toml b/variants/aws-k8s-1.29-fips/Cargo.toml deleted file mode 100644 index 74b4e66b228..00000000000 --- a/variants/aws-k8s-1.29-fips/Cargo.toml +++ /dev/null @@ -1,47 +0,0 @@ -[package] -# This is the aws-k8s-1.29-fips variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_29-fips" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -erofs-root-partition = true -systemd-networkd = true -fips = true - -[package.metadata.build-variant] -included-packages = [ -# core - "release", - "kernel-6.1", - "whippet", -# k8s - "cni", - "cni-plugins", - "kubelet-1.29", - "aws-iam-authenticator", - "soci-snapshotter", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/aws-k8s-1.29-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.29-nvidia-fips/Cargo.toml deleted file mode 100644 index c2a19923b33..00000000000 --- a/variants/aws-k8s-1.29-nvidia-fips/Cargo.toml +++ /dev/null @@ -1,55 +0,0 @@ -[package] -# This is the aws-k8s-1.29-nvidia-fips variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_29-nvidia-fips" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-layout] -os-image-size-gib = 4 - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -erofs-root-partition = true -systemd-networkd = true -fips = true - -[package.metadata.build-variant] -included-packages = [ - # core - "release", - "kernel-6.1", - "containerd-2.1", - "whippet", - # k8s - "cni", - "cni-plugins", - "kubelet-1.29", - "aws-iam-authenticator", - "soci-snapshotter", - # nvidia - "nvidia-container-toolkit-k8s", - "nvidia-k8s-device-plugin", - "kmod-6.1-nvidia-r580-tesla", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/aws-k8s-1.29-nvidia-fips/amispec.toml b/variants/aws-k8s-1.29-nvidia-fips/amispec.toml deleted file mode 120000 index 64c26967c8f..00000000000 --- a/variants/aws-k8s-1.29-nvidia-fips/amispec.toml +++ /dev/null @@ -1 +0,0 @@ -../shared/amispec-split.toml \ No newline at end of file diff --git a/variants/aws-k8s-1.29-nvidia/Cargo.toml b/variants/aws-k8s-1.29-nvidia/Cargo.toml deleted file mode 100644 index 503ab0b6f01..00000000000 --- a/variants/aws-k8s-1.29-nvidia/Cargo.toml +++ /dev/null @@ -1,53 +0,0 @@ -[package] -# This is the aws-k8s-1.29-nvidia variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_29-nvidia" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-layout] -os-image-size-gib = 4 - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -erofs-root-partition = true -systemd-networkd = true - -[package.metadata.build-variant] -included-packages = [ - # core - "release", - "kernel-6.1", - "whippet", - # k8s - "cni", - "cni-plugins", - "kubelet-1.29", - "aws-iam-authenticator", - "soci-snapshotter", - # nvidia - "nvidia-container-toolkit-k8s", - "nvidia-k8s-device-plugin", - "kmod-6.1-nvidia-r580-tesla", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/aws-k8s-1.29/Cargo.toml b/variants/aws-k8s-1.29/Cargo.toml deleted file mode 100644 index d683ea76bcf..00000000000 --- a/variants/aws-k8s-1.29/Cargo.toml +++ /dev/null @@ -1,46 +0,0 @@ -[package] -# This is the aws-k8s-1.29 variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_29" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -erofs-root-partition = true -systemd-networkd = true - -[package.metadata.build-variant] -included-packages = [ -# core - "release", - "kernel-6.1", - "whippet", -# k8s - "cni", - "cni-plugins", - "kubelet-1.29", - "aws-iam-authenticator", - "soci-snapshotter", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/vmware-k8s-1.29-fips/Cargo.toml b/variants/vmware-k8s-1.29-fips/Cargo.toml deleted file mode 100644 index 7ba32b3350f..00000000000 --- a/variants/vmware-k8s-1.29-fips/Cargo.toml +++ /dev/null @@ -1,54 +0,0 @@ -[package] -# This is the vmware-k8s-1.29-fips variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "vmware-k8s-1_29-fips" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-layout] -partition-plan = "unified" - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -erofs-root-partition = true -systemd-networkd = true -fips = true - -[package.metadata.build-variant] -image-format = "vmdk" -supported-arches = ["x86_64"] -kernel-parameters = [ - "console=tty1", - # Only reserve if there are at least 2GB - "crashkernel=2G-:256M", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] -included-packages = [ - # core - "release", - "kernel-6.1", - "whippet", - # k8s - "cni", - "cni-plugins", - "kubelet-1.29", - "soci-snapshotter", - # vmware - "open-vm-tools", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/vmware-k8s-1.29-fips/template.ovf b/variants/vmware-k8s-1.29-fips/template.ovf deleted file mode 120000 index db70bac6f1b..00000000000 --- a/variants/vmware-k8s-1.29-fips/template.ovf +++ /dev/null @@ -1 +0,0 @@ -../shared/template-unified-secboot.ovf \ No newline at end of file diff --git a/variants/vmware-k8s-1.29/Cargo.toml b/variants/vmware-k8s-1.29/Cargo.toml deleted file mode 100644 index 9e6811819a2..00000000000 --- a/variants/vmware-k8s-1.29/Cargo.toml +++ /dev/null @@ -1,53 +0,0 @@ -[package] -# This is the vmware-k8s-1.29 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "vmware-k8s-1_29" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-layout] -partition-plan = "unified" - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -erofs-root-partition = true -systemd-networkd = true - -[package.metadata.build-variant] -image-format = "vmdk" -supported-arches = ["x86_64"] -kernel-parameters = [ - "console=tty1", - # Only reserve if there are at least 2GB - "crashkernel=2G-:256M", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] -included-packages = [ - # core - "release", - "kernel-6.1", - "whippet", - # k8s - "cni", - "cni-plugins", - "kubelet-1.29", - "soci-snapshotter", - # vmware - "open-vm-tools", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/vmware-k8s-1.29/template.ovf b/variants/vmware-k8s-1.29/template.ovf deleted file mode 120000 index db70bac6f1b..00000000000 --- a/variants/vmware-k8s-1.29/template.ovf +++ /dev/null @@ -1 +0,0 @@ -../shared/template-unified-secboot.ovf \ No newline at end of file From 8667a0ff93b81cc1e15018d3a7ace21def1b752e Mon Sep 17 00:00:00 2001 From: Piyush Jena Date: Mon, 16 Mar 2026 07:01:45 +0000 Subject: [PATCH 4/4] docs: drop k8s-1.29 Signed-off-by: Piyush Jena --- README.md | 7 ++---- variants/README.md | 60 +++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 3d062bd1bef..e0d31e44f2d 100644 --- a/README.md +++ b/README.md @@ -61,14 +61,12 @@ For example, an `x86_64` build of the `aws-k8s-1.32` variant will produce an ima The following variants support EKS, as described above: -* `aws-k8s-1.29` * `aws-k8s-1.30` * `aws-k8s-1.31` * `aws-k8s-1.32` * `aws-k8s-1.33` * `aws-k8s-1.34` * `aws-k8s-1.35` -* `aws-k8s-1.29-nvidia` * `aws-k8s-1.30-nvidia` * `aws-k8s-1.31-nvidia` * `aws-k8s-1.32-nvidia` @@ -86,7 +84,6 @@ The following variants support ECS: We also have variants that are designed to be Kubernetes worker nodes in VMware: -* `vmware-k8s-1.29` * `vmware-k8s-1.30` * `vmware-k8s-1.31` * `vmware-k8s-1.32` @@ -96,8 +93,8 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware: The following variants are no longer supported: -* All Kubernetes variants using Kubernetes 1.28 and earlier -* VMware variants using Kubernetes 1.28 and earlier +* All Kubernetes variants using Kubernetes 1.29 and earlier +* VMware variants using Kubernetes 1.29 and earlier * Bare metal variants for Kubernetes * ECS-1 variants diff --git a/variants/README.md b/variants/README.md index f9b776872c2..9f24ea537c5 100644 --- a/variants/README.md +++ b/variants/README.md @@ -35,29 +35,6 @@ For example, in a VMware variant, settings read from the guestinfo interface wil See [_Update Policy_ in the Security Features document](../SECURITY_FEATURES.md#update-policy) for information on when and how Bottlerocket applies security patches to variants. -### aws-k8s-1.29: Kubernetes 1.29 node - -The [aws-k8s-1.29](aws-k8s-1.29/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. -It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). - -This variant is compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. - -### aws-k8s-1.29-nvidia: Kubernetes 1.29 NVIDIA node - -The [aws-k8s-1.29-nvidia](aws-k8s-1.29-nvidia/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. -It also includes the required packages to configure containers to leverage NVIDIA GPUs. -It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). - -This variant is compatible with Kubernetes 1.29, 1.30, 1.31 and 1.32 clusters. - -### aws-k8s-1.29-nvidia-fips: Kubernetes 1.29 NVIDIA FIPS node - -The [aws-k8s-1.29-nvidia-fips](aws-k8s-1.29-nvidia-fips/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. -It also includes the required packages to configure containers to leverage NVIDIA GPUs and is FIPS-enabled. -It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). - -This variant is compatible with Kubernetes 1.29, 1.30, 1.31 and 1.32 clusters. - ### aws-k8s-1.30: Kubernetes 1.30 node The [aws-k8s-1.30](aws-k8s-1.30/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. @@ -247,13 +224,6 @@ User data will be read from IMDS. The [vmware-dev](vmware-dev/Cargo.toml) variant has useful packages for local development of the OS, and is intended to run as a VMware guest. It includes tools for troubleshooting as well as Docker for running containers. -## vmware-k8s-1.29: VMware Kubernetes 1.29 node - -The [vmware-k8s-1.29](vmware-k8s-1.29/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. -It supports self-hosted clusters. - -This variant is compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. - ## vmware-k8s-1.30: VMware Kubernetes 1.30 node The [vmware-k8s-1.30](vmware-k8s-1.30/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. @@ -587,6 +557,36 @@ It supports self-hosted clusters. This variant was compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. +### aws-k8s-1.29: Kubernetes 1.29 node + +The aws-k8s-1.29 variant included the packages needed to run a Kubernetes node in AWS. +It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant was compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. + +### aws-k8s-1.29-nvidia: Kubernetes 1.29 NVIDIA node + +The aws-k8s-1.29-nvidia variant included the packages needed to run a Kubernetes node in AWS. +It also included the required packages to configure containers to leverage NVIDIA GPUs. +It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant was compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. + +### aws-k8s-1.29-nvidia-fips: Kubernetes 1.29 NVIDIA FIPS node + +The [aws-k8s-1.29-nvidia-fips](aws-k8s-1.29-nvidia-fips/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. +It also includes the required packages to configure containers to leverage NVIDIA GPUs and is FIPS-enabled. +It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant is compatible with Kubernetes 1.29, 1.30, 1.31 and 1.32 clusters. + +## vmware-k8s-1.29: VMware Kubernetes 1.29 node + +The vmware-k8s-1.29 variant included the packages needed to run a Kubernetes worker node as a VMware guest. +It supported self-hosted clusters. + +This variant was compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. + ### aws-ecs-1: Amazon ECS container instance The [aws-ecs-1](aws-ecs-1/Cargo.toml) variant included the packages needed to run an [Amazon ECS](https://ecs.aws)