Skip to content

Commit

Permalink
Merge pull request #4079 from ginglis13/drop-k8s-127-metal-vmware
Browse files Browse the repository at this point in the history
Drop k8s 1.27 metal and VMWare variants
  • Loading branch information
ginglis13 authored Jul 3, 2024
2 parents 6283393 + 09f7a91 commit edc92b3
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 124 deletions.
18 changes: 0 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down
28 changes: 14 additions & 14 deletions variants/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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`.
Expand Down
42 changes: 0 additions & 42 deletions variants/metal-k8s-1.27/Cargo.toml

This file was deleted.

44 changes: 0 additions & 44 deletions variants/vmware-k8s-1.27/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion variants/vmware-k8s-1.27/template.ovf

This file was deleted.

0 comments on commit edc92b3

Please sign in to comment.