Merge pull request #2988 from stmcginnis/remove-k8s-1.22

Drop Kubernetes 1.22 variants
bottlerocket-os · May 16, 2023 · c8ed0fb · c8ed0fb
2 parents 3ba1fb9 + 19a08ae
commit c8ed0fb
Show file tree

Hide file tree

Showing 117 changed files with 31 additions and 1,219 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -150,7 +150,7 @@ cargo make -e BUILDSYS_UPSTREAM_LICENSE_FETCH=true fetch-licenses
 3. Build your image, setting the `BUILDSYS_UPSTREAM_SOURCE_FALLBACK` flag to `true`, if you haven't cached the driver's sources:
 
 ```shell
-K8S_VERSION=1.22
+K8S_VERSION=1.24
 cargo make \
   -e BUILDSYS_VARIANT=aws-k8s-${K8S_VERSION}-nvidia \
   -e BUILDSYS_UPSTREAM_SOURCE_FALLBACK="true"

diff --git a/README.md b/README.md
@@ -60,13 +60,11 @@ 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.22`
 * `aws-k8s-1.23`
 * `aws-k8s-1.24`
 * `aws-k8s-1.25`
 * `aws-k8s-1.26`
 * `aws-k8s-1.27`
-* `aws-k8s-1.22-nvidia`
 * `aws-k8s-1.23-nvidia`
 * `aws-k8s-1.24-nvidia`
 * `aws-k8s-1.25-nvidia`
@@ -80,7 +78,6 @@ The following variants support ECS:
 
 We also have variants that are designed to be Kubernetes worker nodes in VMware:
 
-* `vmware-k8s-1.22`
 * `vmware-k8s-1.23`
 * `vmware-k8s-1.24`
 * `vmware-k8s-1.25`
@@ -89,7 +86,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.22`
 * `metal-k8s-1.23`
 * `metal-k8s-1.24`
 * `metal-k8s-1.25`
@@ -98,7 +94,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.21 and earlier
+* All Kubernetes variants using Kubernetes 1.22 and earlier
 
 We recommend users replace nodes running these variants with the [latest variant compatible with their cluster](variants/).
 

diff --git a/packages/kubernetes-1.22/Cargo.toml b/packages/kubernetes-1.22/Cargo.toml
diff --git a/packages/kubernetes-1.22/build.rs b/packages/kubernetes-1.22/build.rs
diff --git a/packages/kubernetes-1.22/clarify.toml b/packages/kubernetes-1.22/clarify.toml
diff --git a/packages/kubernetes-1.22/credential-provider-config-yaml b/packages/kubernetes-1.22/credential-provider-config-yaml
diff --git a/packages/kubernetes-1.22/etc-kubernetes-pki-private.mount b/packages/kubernetes-1.22/etc-kubernetes-pki-private.mount
diff --git a/packages/kubernetes-1.22/kubelet-bootstrap-kubeconfig b/packages/kubernetes-1.22/kubelet-bootstrap-kubeconfig