From a4508e56bd8d180c74907370520b4cfa68abc07f Mon Sep 17 00:00:00 2001 From: Matthew Yeazel Date: Thu, 7 Nov 2024 02:27:05 +0000 Subject: [PATCH] Drop k8s 1.28 and 1.29 metal variants Signed-off-by: Matthew Yeazel --- Cargo.lock | 18 ------------ Cargo.toml | 2 -- README.md | 8 ++---- variants/README.md | 27 +++++++++--------- variants/metal-k8s-1.28/Cargo.toml | 46 ------------------------------ variants/metal-k8s-1.29/Cargo.toml | 46 ------------------------------ 6 files changed, 16 insertions(+), 131 deletions(-) delete mode 100644 variants/metal-k8s-1.28/Cargo.toml delete mode 100644 variants/metal-k8s-1.29/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 38abaf9a9a8..bc107078e39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,24 +200,6 @@ dependencies = [ "settings-plugins", ] -[[package]] -name = "metal-k8s-1_28" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - -[[package]] -name = "metal-k8s-1_29" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - [[package]] name = "settings-defaults" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 4745360d459..a5eeb260b10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,8 +26,6 @@ members = [ "variants/aws-k8s-1.30-nvidia", "variants/aws-k8s-1.31-nvidia", "variants/metal-dev", - "variants/metal-k8s-1.28", - "variants/metal-k8s-1.29", "variants/vmware-dev", "variants/vmware-k8s-1.28", "variants/vmware-k8s-1.29", diff --git a/README.md b/README.md index 191d6b9e5c1..02a5516e462 100644 --- a/README.md +++ b/README.md @@ -92,15 +92,11 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware: * `vmware-k8s-1.30` * `vmware-k8s-1.31` -The following variants are designed to be Kubernetes worker nodes on bare metal: - -* `metal-k8s-1.28` -* `metal-k8s-1.29` - The following variants are no longer supported: * All Kubernetes variants using Kubernetes 1.23 and earlier -* Bare metal and VMware variants using Kubernetes 1.27 and earlier +* VMware variants using Kubernetes 1.27 and earlier +* Bare metal variants for Kubernetes 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 index 845132e4c75..9f8324ac810 100644 --- a/variants/README.md +++ b/variants/README.md @@ -221,19 +221,6 @@ This variant is compatible with Kubernetes 1.31, 1.32, 1.33, and 1.34 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.28: Metal Kubernetes 1.28 node - -The [metal-k8s-1.28](metal-k8s-1.28/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.28, 1.29, 1.30, and 1.31 clusters. - -### metal-k8s-1.29: Metal Kubernetes 1.28 node - -The [metal-k8s-1.29](metal-k8s-1.29/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.29, 1.30, 1.31, and 1.32 clusters. ### Deprecated variants @@ -446,6 +433,20 @@ It supported self-hosted clusters. This variant was compatible with Kubernetes 1.27, 1.28, 1.29, and 1.30 clusters. +### metal-k8s-1.28: Metal Kubernetes 1.28 node + +The [metal-k8s-1.28](metal-k8s-1.28/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.28, 1.29, 1.30, and 1.31 clusters. + +### metal-k8s-1.29: Metal Kubernetes 1.29 node + +The [metal-k8s-1.29](metal-k8s-1.29/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.29, 1.30, 1.31, and 1.32 clusters. + ## Development Say we want to create `my-variant`, a custom build of Bottlerocket that runs `my-agent`. diff --git a/variants/metal-k8s-1.28/Cargo.toml b/variants/metal-k8s-1.28/Cargo.toml deleted file mode 100644 index 5e456e70966..00000000000 --- a/variants/metal-k8s-1.28/Cargo.toml +++ /dev/null @@ -1,46 +0,0 @@ -[package] -# This is the metal-k8s-1.28 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "metal-k8s-1_28" -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 -partition-plan = "unified" - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -systemd-networkd = true - -[package.metadata.build-variant] -image-format = "raw" -supported-arches = ["x86_64"] -kernel-parameters = [ - # Only reserve if there are at least 2GB - "crashkernel=2G-:256M" -] -included-packages = [ - # core - "release", - "kernel-6.1", - # k8s - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kubelet-1.28", -] - -[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/metal-k8s-1.29/Cargo.toml b/variants/metal-k8s-1.29/Cargo.toml deleted file mode 100644 index f1cc32487d9..00000000000 --- a/variants/metal-k8s-1.29/Cargo.toml +++ /dev/null @@ -1,46 +0,0 @@ -[package] -# This is the metal-k8s-1.29 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "metal-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] -os-image-size-gib = 4 -partition-plan = "unified" - -[package.metadata.build-variant.image-features] -grub-set-private-var = true -uefi-secure-boot = true -xfs-data-partition = true -systemd-networkd = true - -[package.metadata.build-variant] -image-format = "raw" -supported-arches = ["x86_64"] -kernel-parameters = [ - # Only reserve if there are at least 2GB - "crashkernel=2G-:256M" -] -included-packages = [ - # core - "release", - "kernel-6.1", - # k8s - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kubelet-1.29", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" }