Deprecate k8s 1.29

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",

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
 

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)

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)

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)