variants: drop AWS k8s 1.23 variants

Drop the aws-k8s-1.23 and aws-k8s-1.23-nvidia variants following the EKS support policy. The variants go EOL in EKS on October 11 Signed-off-by: Gavin Inglis <[email protected]>
bottlerocket-os · Oct 1, 2024 · a81fd0e · a81fd0e
1 parent 800458c
commit a81fd0e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 121 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,6 @@ members = [
     "variants/aws-ecs-2",
     "variants/aws-ecs-1-nvidia",
     "variants/aws-ecs-2-nvidia",
-    "variants/aws-k8s-1.23",
-    "variants/aws-k8s-1.23-nvidia",
     "variants/aws-k8s-1.24",
     "variants/aws-k8s-1.24-nvidia",
     "variants/aws-k8s-1.25",

diff --git a/README.md b/README.md
@@ -61,7 +61,6 @@ For example, an `x86_64` build of the `aws-k8s-1.24` variant will produce an ima
 
 The following variants support EKS, as described above:
 
-* `aws-k8s-1.23`
 * `aws-k8s-1.24`
 * `aws-k8s-1.25`
 * `aws-k8s-1.26`
@@ -101,7 +100,7 @@ The following variants are designed to be Kubernetes worker nodes on bare metal:
 
 The following variants are no longer supported:
 
-* All Kubernetes variants using Kubernetes 1.22 and earlier
+* All Kubernetes variants using Kubernetes 1.23 and earlier
 * Bare metal and VMware variants using Kubernetes 1.27 and earlier
 
 We recommend users replace nodes running these variants with the [latest variant compatible with their cluster](variants/).

diff --git a/variants/README.md b/variants/README.md
@@ -35,21 +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.23: Kubernetes 1.23 node
-
-The [aws-k8s-1.23](aws-k8s-1.23/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.23, 1.24, and 1.25 clusters.
-
-### aws-k8s-1.23-nvidia: Kubernetes 1.23 NVIDIA node
-
-The [aws-k8s-1.23-nvidia](aws-k8s-1.23-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.23, 1.24, and 1.25 clusters.
-
 ### aws-k8s-1.24: Kubernetes 1.24 node
 
 The [aws-k8s-1.24](aws-k8s-1.24/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS.
@@ -376,6 +361,21 @@ It supported self-hosted clusters.
 
 This variant was compatible with Kubernetes 1.22, 1.23, and 1.24 clusters.
 
+### aws-k8s-1.23: Kubernetes 1.23 node
+
+The [aws-k8s-1.23](aws-k8s-1.23/Cargo.toml) 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.23, 1.24, and 1.25 clusters.
+
+### aws-k8s-1.23-nvidia: Kubernetes 1.23 NVIDIA node
+
+The [aws-k8s-1.23-nvidia](aws-k8s-1.23-nvidia/Cargo.toml) 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.23, 1.24, and 1.25 clusters.
+
 ### metal-k8s-1.23: Metal Kubernetes 1.23 node
 
 The metal-k8s-1.23 variant included the packages needed to run a Kubernetes worker node on bare metal.

diff --git a/variants/aws-k8s-1.23-nvidia/Cargo.toml b/variants/aws-k8s-1.23-nvidia/Cargo.toml
diff --git a/variants/aws-k8s-1.23/Cargo.toml b/variants/aws-k8s-1.23/Cargo.toml