Merge pull request #3742 from yeazelm/nomoretwentyfour

Drop K8s 1.24 metal and VMware variants

README.md

@@ -85,7 +85,6 @@ The following variants support ECS:
 
 We also have variants that are designed to be Kubernetes worker nodes in VMware:
 
-* `vmware-k8s-1.24`
 * `vmware-k8s-1.25`
 * `vmware-k8s-1.26`
 * `vmware-k8s-1.27`
@@ -94,7 +93,6 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware:
 
 The following variants are designed to be Kubernetes worker nodes on bare metal:
 
-* `metal-k8s-1.24`
 * `metal-k8s-1.25`
 * `metal-k8s-1.26`
 * `metal-k8s-1.27`
@@ -104,6 +102,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
+* Bare metal and VMware variants using Kubernetes 1.24 and earlier
 
 We recommend users replace nodes running these variants with the [latest variant compatible with their cluster](variants/).
 

sources/models/README.md

@@ -122,11 +122,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 * [Model](src/vmware-dev/mod.rs)
 * [Default settings](src/vmware-dev/defaults.d/)
 
-### vmware-k8s-1.24: VMware Kubernetes 1.24
-
-* [Model](src/vmware-k8s-1.29/mod.rs)
-* [Default settings](src/vmware-k8s-1.29/defaults.d/)
-
 ### vmware-k8s-1.25: VMware Kubernetes 1.25
 
 * [Model](src/vmware-k8s-1.29/mod.rs)
@@ -157,11 +152,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 * [Model](src/metal-dev/mod.rs)
 * [Default settings](src/metal-dev/defaults.d/)
 
-### metal-k8s-1.24: Metal Kubernetes 1.24
-
-* [Model](src/metal-k8s-1.29/mod.rs)
-* [Default settings](src/metal-k8s-1.29/defaults.d/)
-
 ### metal-k8s-1.25: Metal Kubernetes 1.25
 
 * [Model](src/metal-k8s-1.29/mod.rs)

sources/models/src/lib.rs

@@ -119,11 +119,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 * [Model](src/vmware-dev/mod.rs)
 * [Default settings](src/vmware-dev/defaults.d/)
 
-## vmware-k8s-1.24: VMware Kubernetes 1.24
-
-* [Model](src/vmware-k8s-1.29/mod.rs)
-* [Default settings](src/vmware-k8s-1.29/defaults.d/)
-
 ## vmware-k8s-1.25: VMware Kubernetes 1.25
 
 * [Model](src/vmware-k8s-1.29/mod.rs)
@@ -154,11 +149,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 * [Model](src/metal-dev/mod.rs)
 * [Default settings](src/metal-dev/defaults.d/)
 
-## metal-k8s-1.24: Metal Kubernetes 1.24
-
-* [Model](src/metal-k8s-1.29/mod.rs)
-* [Default settings](src/metal-k8s-1.29/defaults.d/)
-
 ## metal-k8s-1.25: Metal Kubernetes 1.25
 
 * [Model](src/metal-k8s-1.29/mod.rs)

variants/Cargo.toml

@@ -21,14 +21,12 @@ members = [
     "aws-k8s-1.28-nvidia",
     "aws-k8s-1.29-nvidia",
     "metal-dev",
-    "metal-k8s-1.24",
     "metal-k8s-1.25",
     "metal-k8s-1.26",
     "metal-k8s-1.27",
     "metal-k8s-1.28",
     "metal-k8s-1.29",
     "vmware-dev",
-    "vmware-k8s-1.24",
     "vmware-k8s-1.25",
     "vmware-k8s-1.26",
     "vmware-k8s-1.27",

variants/README.md

@@ -173,13 +173,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.24: VMware Kubernetes 1.24 node
-
-The [vmware-k8s-1.24](vmware-k8s-1.24/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.24, 1.25, and 1.26 clusters.
-
 ### vmware-k8s-1.25: VMware Kubernetes 1.25 node
 
 The [vmware-k8s-1.25](vmware-k8s-1.25/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest.
@@ -220,13 +213,6 @@ This variant is compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters.
 The [metal-dev](metal-dev/Cargo.toml) variant has useful packages for local development of the OS and is intended to run bare metal.
 It includes tools for troubleshooting as well as Docker for running containers.
 
-### metal-k8s-1.24: Metal Kubernetes 1.24 node
-
-The [metal-k8s-1.24](metal-k8s-1.24/Cargo.toml) variant includes the packages needed to run a Kubernetes node on bare metal.
-It supports self-hosted clusters.
-
-This variant is compatible with Kubernetes 1.24, 1.25, and 1.26 clusters.
-
 ### metal-k8s-1.25: Metal Kubernetes 1.25 node
 
 The [metal-k8s-1.25](metal-k8s-1.25/Cargo.toml) variant includes the packages needed to run a Kubernetes node on bare metal.
@@ -402,6 +388,20 @@ It supported self-hosted clusters.
 
 This variant was compatible with Kubernetes 1.23, 1.24, and 1.25 clusters.
 
+### vmware-k8s-1.24: VMware Kubernetes 1.24 node
+
+The vmware-k8s-1.24 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.24, 1.25, and 1.26 clusters.
+
+### metal-k8s-1.24: Metal Kubernetes 1.24 node
+
+The metal-k8s-1.24 variant included the packages needed to run a Kubernetes node on bare metal.
+It supported self-hosted clusters.
+
+This variant was compatible with Kubernetes 1.24, 1.25, and 1.26 clusters.
+
 ## Development
 
 Say we want to create `my-variant`, a custom build of Bottlerocket that runs `my-agent`.