Remove kubernetes 1.21 variants

This removes the 1.21 k8s variants. This version of Kubernetes has gone end of life and we will no longer support it. Docs and other references to 1.21 have been updated to refer to more current versions. Signed-off-by: Sean McGinnis <[email protected]>
bottlerocket-os · Feb 28, 2023 · da5293e · da5293e
1 parent 9b3d9c9
commit da5293e
Show file tree

Hide file tree

Showing 57 changed files with 56 additions and 1,252 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 30,7 @@ jobs:
  continue-on-error: ${{ matrix.supported }}
  strategy:
  matrix:
- variant: [aws-k8s-1.21, aws-k8s-1.22, aws-k8s-1.23, aws-k8s-1.24, aws-k8s-1.25, aws-ecs-1]
  variant: [aws-k8s-1.22, aws-k8s-1.23, aws-k8s-1.24, aws-k8s-1.25, aws-ecs-1]
  arch: [x86_64, aarch64]
  supported: [true]
  fetch-upstream: ["false"]
@@ -47,10 47,6 @@ jobs:
  arch: x86_64
  supported: false
  fetch-upstream: "false"
- - variant: metal-k8s-1.21
- arch: x86_64
- supported: false
- fetch-upstream: "false"
  - variant: metal-k8s-1.22
  arch: x86_64
  supported: false
@@ -67,10 63,6 @@ jobs:
  arch: x86_64
  supported: false
  fetch-upstream: "false"
- - variant: vmware-k8s-1.21
- arch: x86_64
- supported: true
- fetch-upstream: "false"
  - variant: vmware-k8s-1.22
  arch: x86_64
  supported: true
@@ -87,14 79,6 @@ jobs:
  arch: x86_64
  supported: true
  fetch-upstream: "false"
- - variant: aws-k8s-1.21-nvidia
- arch: x86_64
- supported: true
- fetch-upstream: "true"
- - variant: aws-k8s-1.21-nvidia
- arch: aarch64
- supported: true
- fetch-upstream: "true"
  - variant: aws-k8s-1.22-nvidia
  arch: x86_64
  supported: true

diff --git a/BUILDING.md b/BUILDING.md
@@ -203,7 203,7 @@ The specifics of building an out-of-tree module will vary by project, but the fi
 ### Downloading the kmod kit
 
 kmod kits are included in the official Bottlerocket repos starting with Bottlerocket v1.0.6.
-Let's say you want to download the kit for building x86_64 modules for v1.7.0 and variant aws-k8s-1.21.
 Let's say you want to download the kit for building x86_64 modules for v1.11.0 and variant aws-k8s-1.24.
 
 First, you need tuftool:
 ```shell
@@ -220,8 220,8 @@ sha512sum -c <<<"b81af4d8eb86743539fbc4709d33ada7b118d9f929f0c2f6c04e1d41f46241e
 Next, set your desired parameters, and download the kmod kit:
 ```shell
 ARCH=x86_64
-VERSION=v1.7.0
-VARIANT=aws-k8s-1.21
 VERSION=v1.11.0
 VARIANT=aws-k8s-1.24
 OUTDIR="${VARIANT}-${VERSION}"
 
 tuftool download "${OUTDIR}" --target-name ${VARIANT}-${ARCH}-kmod-kit-${VERSION}.tar.xz \

diff --git a/QUICKSTART-VMWARE.md b/QUICKSTART-VMWARE.md
@@ -46,7 46,7 @@ Next, set your desired version and variant, and download the OVA:
 
 ```shell
 VERSION="v1.6.1"
-VARIANT="vmware-k8s-1.21"
 VARIANT="vmware-k8s-1.24"
 OVA="bottlerocket-${VARIANT}-x86_64-${VERSION}.ova"
 OUTDIR="${VARIANT}-${VERSION}"
 

diff --git a/README.md b/README.md
@@ -60,12 60,10 @@ 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.21`
 * `aws-k8s-1.22`
 * `aws-k8s-1.23`
 * `aws-k8s-1.24`
 * `aws-k8s-1.25`
-* `aws-k8s-1.21-nvidia`
 * `aws-k8s-1.22-nvidia`
 * `aws-k8s-1.23-nvidia`
 * `aws-k8s-1.24-nvidia`
@@ -78,29 76,21 @@ The following variants support ECS:
 
 We also have variants that are designed to be Kubernetes worker nodes in VMware:
 
-* `vmware-k8s-1.21`
 * `vmware-k8s-1.22`
 * `vmware-k8s-1.23`
 * `vmware-k8s-1.24`
 * `vmware-k8s-1.25`
 
 The following variants are designed to be Kubernetes worker nodes on bare metal:
 
-* `metal-k8s-1.21`
 * `metal-k8s-1.22`
 * `metal-k8s-1.23`
 * `metal-k8s-1.24`
 * `metal-k8s-1.25`
 
 The following variants are no longer supported:
 
-* `aws-k8s-1.15`
-* `aws-k8s-1.16`
-* `aws-k8s-1.17`
-* `aws-k8s-1.18`
-* `aws-k8s-1.19`
-* `aws-k8s-1.20`
-* `vmware-k8s-1.20`
 * All Kubernetes variants using Kubernetes 1.21 and earlier
 
 We recommend users replace nodes running these variants with the [latest variant compatible with their cluster](variants/).
 

diff --git a/TESTING.md b/TESTING.md
@@ -198,18 198,18 @@ You will need to delete the EKS cluster manually when you are done using it.
 
 ```shell
 cargo make \
- -e BUILDSYS_VARIANT="aws-k8s-1.21" \
  -e BUILDSYS_VARIANT="aws-k8s-1.24" \
  -e BUILDSYS_ARCH="x86_64" \
  build
 
 cargo make \
- -e BUILDSYS_VARIANT="aws-k8s-1.21" \
  -e BUILDSYS_VARIANT="aws-k8s-1.24" \
  -e BUILDSYS_ARCH="x86_64" \
  -e PUBLISH_REGIONS="us-west-2"
  ami
 
 cargo make \
- -e BUILDSYS_VARIANT="aws-k8s-1.21" \
  -e BUILDSYS_VARIANT="aws-k8s-1.24" \
  -e BUILDSYS_ARCH="x86_64" \
  test
 ```

diff --git a/packages/kubernetes-1.21/0001-AWS-Include-IPv6-addresses-in-NodeAddresses.patch b/packages/kubernetes-1.21/0001-AWS-Include-IPv6-addresses-in-NodeAddresses.patch
diff --git a/packages/kubernetes-1.21/0002-IPv6-node-address-before-comparing-with-node-I.patch b/packages/kubernetes-1.21/0002-IPv6-node-address-before-comparing-with-node-I.patch