diff --git a/Cargo.lock b/Cargo.lock index ac65bdf3c98..76c1ad8fd50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,15 +200,6 @@ dependencies = [ "settings-plugins", ] -[[package]] -name = "metal-k8s-1_27" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - [[package]] name = "metal-k8s-1_28" version = "0.1.0" @@ -248,15 +239,6 @@ dependencies = [ "settings-plugins", ] -[[package]] -name = "vmware-k8s-1_27" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - [[package]] name = "vmware-k8s-1_28" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 25028a36995..7a4d0fad8f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,11 +26,9 @@ members = [ "variants/aws-k8s-1.29-nvidia", "variants/aws-k8s-1.30-nvidia", "variants/metal-dev", - "variants/metal-k8s-1.27", "variants/metal-k8s-1.28", "variants/metal-k8s-1.29", "variants/vmware-dev", - "variants/vmware-k8s-1.27", "variants/vmware-k8s-1.28", "variants/vmware-k8s-1.29", "variants/vmware-k8s-1.30", diff --git a/README.md b/README.md index b13c0747fa8..1c20b2df12d 100644 --- a/README.md +++ b/README.md @@ -87,21 +87,19 @@ The following variants support ECS: We also have variants that are designed to be Kubernetes worker nodes in VMware: -* `vmware-k8s-1.27` * `vmware-k8s-1.28` * `vmware-k8s-1.29` * `vmware-k8s-1.30` The following variants are designed to be Kubernetes worker nodes on bare metal: -* `metal-k8s-1.27` * `metal-k8s-1.28` * `metal-k8s-1.29` The following variants are no longer supported: * All Kubernetes variants using Kubernetes 1.22 and earlier -* Bare metal and VMware variants using Kubernetes 1.26 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 index 0a1d5ffed57..fcdea3826a5 100644 --- a/variants/README.md +++ b/variants/README.md @@ -188,13 +188,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.27: VMware Kubernetes 1.27 node - -The [vmware-k8s-1.27](vmware-k8s-1.27/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.27, 1.28, 1.29, and 1.30 clusters. - ## vmware-k8s-1.28: VMware Kubernetes 1.28 node The [vmware-k8s-1.28](vmware-k8s-1.28/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. @@ -221,13 +214,6 @@ This variant is compatible with Kubernetes 1.30, 1.31, 1.32, and 1.33 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.27: Metal Kubernetes 1.27 node - -The [metal-k8s-1.27](metal-k8s-1.27/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.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. @@ -424,6 +410,20 @@ It supported self-hosted clusters. This variant was compatible with Kubernetes 1.26, 1.27, 1.28, and 1.29 clusters. +## vmware-k8s-1.27: VMware Kubernetes 1.27 node + +The [vmware-k8s-1.27](vmware-k8s-1.27/Cargo.toml) 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.27, 1.28, 1.29, and 1.30 clusters. + +### metal-k8s-1.27: Metal Kubernetes 1.27 node + +The [metal-k8s-1.27](metal-k8s-1.27/Cargo.toml) 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.27, 1.28, 1.29, and 1.30 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.27/Cargo.toml b/variants/metal-k8s-1.27/Cargo.toml deleted file mode 100644 index 116292db23a..00000000000 --- a/variants/metal-k8s-1.27/Cargo.toml +++ /dev/null @@ -1,42 +0,0 @@ -[package] -# This is the metal-k8s-1.27 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "metal-k8s-1_27" -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 - -[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 = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-6.1", - "linux-firmware", - "kubelet-1.27", - "release", -] - -[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.27/Cargo.toml b/variants/vmware-k8s-1.27/Cargo.toml deleted file mode 100644 index f8110465af0..00000000000 --- a/variants/vmware-k8s-1.27/Cargo.toml +++ /dev/null @@ -1,44 +0,0 @@ -[package] -# This is the vmware-k8s-1.27 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "vmware-k8s-1_27" -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 - -[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 = [ - "cni", - "cni-plugins", - "kernel-6.1", - "kubelet-1.27", - "open-vm-tools", - "release", -] - -[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.27/template.ovf b/variants/vmware-k8s-1.27/template.ovf deleted file mode 120000 index e301e3bb05d..00000000000 --- a/variants/vmware-k8s-1.27/template.ovf +++ /dev/null @@ -1 +0,0 @@ -../shared/template-unified.ovf \ No newline at end of file