update README's and supporting files for deprecating 1.25 and 1.26 (#…

…3145)
aws · Jul 2, 2024 · 6f2e840 · 6f2e840
1 parent a014bd1
commit 6f2e840
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 65 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -25,12 +25,6 @@ do-not-merge/hold:
 base-img-pkg-update:
   - "EKS_DISTRO_BASE_TAG_FILE"
 
-v1.25:
-  - "**/1-25/**/*"
-
-v1.26:
-  - "**/1-26/**/*"
-
 v1.27:
   - "**/1-27/**/*"
 

diff --git a/README.md b/README.md
@@ -3,8 +3,6 @@
 
 | Release | Development Build Status                                                                                                                  |
 |---------|-------------------------------------------------------------------------------------------------------------------------------------------|
-| 1-25    | [![1-25](https://prow.eks.amazonaws.com/badge.svg?jobs=build-1-25-postsubmit)](https://prow.eks.amazonaws.com/?job=build-1-25-postsubmit) |
-| 1-26    | [![1-26](https://prow.eks.amazonaws.com/badge.svg?jobs=build-1-26-postsubmit)](https://prow.eks.amazonaws.com/?job=build-1-26-postsubmit) |
 | 1-27    | [![1-27](https://prow.eks.amazonaws.com/badge.svg?jobs=build-1-27-postsubmit)](https://prow.eks.amazonaws.com/?job=build-1-27-postsubmit) |
 | 1-28    | [![1-28](https://prow.eks.amazonaws.com/badge.svg?jobs=build-1-28-postsubmit)](https://prow.eks.amazonaws.com/?job=build-1-28-postsubmit) |
 | 1-29    | [![1-29](https://prow.eks.amazonaws.com/badge.svg?jobs=build-1-29-postsubmit)](https://prow.eks.amazonaws.com/?job=build-1-29-postsubmit) |
@@ -62,29 +60,15 @@ Source: https://github.com/cncf/artwork/tree/master/projects/kubernetes/certifie
 | 33 | [v1-27-eks-33](https://distro.eks.amazonaws.com/kubernetes-1-27/kubernetes-1-27-eks-33.yaml) | [v1.27.14](https://github.com/kubernetes/kubernetes/release/tag/v1.27.14) |
 
 
-### Kubernetes 1-26
-
-| Release | Manifest | Kubernetes Version |
-| -- | --- | --- |
-| 39 | [v1-26-eks-39](https://distro.eks.amazonaws.com/kubernetes-1-26/kubernetes-1-26-eks-39.yaml) | [v1.26.15](https://github.com/kubernetes/kubernetes/release/tag/v1.26.15) |
-
-
-### Kubernetes 1-25
-
-| Release | Manifest | Kubernetes Version |
-| -- | --- | --- |
-| 40 | [v1-25-eks-40](https://distro.eks.amazonaws.com/kubernetes-1-25/kubernetes-1-25-eks-40.yaml) | [v1.25.16](https://github.com/kubernetes/kubernetes/release/tag/v1.25.16) |
-
-
-### Kubernetes 1.18 - 1.24: DEPRECATED
+### Kubernetes 1.18 - 1.26: DEPRECATED
 
 In alignment with the [Amazon EKS release calendar](https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html#kubernetes-release-calendar),
-EKS Distro has discontinued support of Kubernetes v1.18 - v1.24. While there are
+EKS Distro has discontinued support of Kubernetes v1.18 - v1.26. While there are
 no plans to remove these versions' images from EKS Distro ECR, there will be no
 more updates, including security fixes, for them.
 
 **Due to the increased security risk this poses, it is HIGHLY recommended that
-users of v1.18 - v1.24 update to a supported version (v1.24+) as soon as
+users of v1.18 - v1.26 update to a supported version (v1.27+) as soon as
 possible.**
 
 ## Development

diff --git a/docs/contents/index.md b/docs/contents/index.md
@@ -207,7 +207,7 @@ if you are interested in the AL2 container runtime kernel version.
 * [v1-27-eks-2](releases/1-27/2/index.md) (May 24, 2023)
 * [v1-27-eks-1](releases/1-27/1/index.md) (May 24, 2023)
 
-#### EKS-D 1.26 Version Dependencies
+#### EKS-D 1.26 Version Dependencies (DEPRECATED)
 * [v1-26-eks-39](releases/1-26/39/index.md) (June 24, 2024)
 * [v1-26-eks-38](releases/1-26/38/index.md) (June 07, 2024)
 * [v1-26-eks-37](releases/1-26/37/index.md) (May 31, 2024)
@@ -248,7 +248,7 @@ if you are interested in the AL2 container runtime kernel version.
 * [v1-26-eks-2](releases/1-26/2/index.md) (February 22, 2023)
 * [v1-26-eks-1](releases/1-26/1/index.md) (February 8, 2023)
 
-#### EKS-D 1.25 Version Dependencies
+#### EKS-D 1.25 Version Dependencies (DEPRECATED)
 * [v1-25-eks-40](releases/1-25/40/index.md) (May 28, 2024)
 * [v1-25-eks-39](releases/1-25/39/index.md) (May 13, 2024)
 * [v1-25-eks-38](releases/1-25/38/index.md) (April 29, 2024)

diff --git a/projects/containernetworking/plugins/README.md b/projects/containernetworking/plugins/README.md
@@ -2,11 +2,10 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-25    | ![Version](https://img.shields.io/badge/version-v1.3.0-blue) |
-| 1-26    | ![Version](https://img.shields.io/badge/version-v1.3.0-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v1.3.0-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v1.3.0-blue) |
 | 1-29    | ![Version](https://img.shields.io/badge/version-v1.4.0-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v1.4.0-blue) |
 
 ### Updating
 

diff --git a/projects/coredns/coredns/README.md b/projects/coredns/coredns/README.md
@@ -1,11 +1,11 @@
 ## CoreDNS
 
-| Release | Version                                                      |
-|---------|--------------------------------------------------------------|
-| 1-25    | ![Version](https://img.shields.io/badge/version-v1.9.3-blue) |
-| 1-26    | ![Version](https://img.shields.io/badge/version-v1.9.3-blue) |
-| 1-27    | ![Version](https://img.shields.io/badge/version-v1.10.1-blue)|
-| 1-28    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue)|
+| Release | Version                                                       |
+|---------|---------------------------------------------------------------|
+| 1-27    | ![Version](https://img.shields.io/badge/version-v1.10.1-blue) |
+| 1-28    | ![Version](https://img.shields.io/badge/version-v1.10.1-blue) |
+| 1-29    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue) |
 
 ### Updating
 

diff --git a/projects/etcd-io/etcd/README.md b/projects/etcd-io/etcd/README.md
@@ -2,10 +2,10 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-25    | ![Version](https://img.shields.io/badge/version-v3.5.13-blue) |
-| 1-26    | ![Version](https://img.shields.io/badge/version-v3.5.13-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v3.5.13-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v3.5.13-blue) |
+| 1-29    | ![Version](https://img.shields.io/badge/version-v3.5.13-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v3.5.13-blue) |
 
 ### Updating
 

diff --git a/projects/kubernetes-csi/external-attacher/README.md b/projects/kubernetes-csi/external-attacher/README.md
@@ -2,7 +2,6 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-26    | ![Version](https://img.shields.io/badge/version-v4.6.1-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v4.6.1-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v4.6.1-blue) |
 | 1-29    | ![Version](https://img.shields.io/badge/version-v4.6.1-blue) |

diff --git a/projects/kubernetes-csi/external-provisioner/README.md b/projects/kubernetes-csi/external-provisioner/README.md
@@ -2,7 +2,6 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-26    | ![Version](https://img.shields.io/badge/version-v5.0.1-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v5.0.1-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v5.0.1-blue) |
 | 1-29    | ![Version](https://img.shields.io/badge/version-v5.0.1-blue) |

diff --git a/projects/kubernetes-csi/external-resizer/README.md b/projects/kubernetes-csi/external-resizer/README.md
@@ -2,7 +2,6 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-26    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue) |
 | 1-29    | ![Version](https://img.shields.io/badge/version-v1.11.1-blue) |

diff --git a/projects/kubernetes-csi/external-snapshotter/README.md b/projects/kubernetes-csi/external-snapshotter/README.md
@@ -2,7 +2,6 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-26    | ![Version](https://img.shields.io/badge/version-v8.0.1-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v8.0.1-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v8.0.1-blue) |
 | 1-29    | ![Version](https://img.shields.io/badge/version-v8.0.1-blue) |

diff --git a/projects/kubernetes-csi/livenessprobe/README.md b/projects/kubernetes-csi/livenessprobe/README.md
@@ -1,11 +1,11 @@
 ## CSI livenessprobe
 
-| Release | Version                                                      |
-|---------|--------------------------------------------------------------|
-| 1-26    | ![Version](https://img.shields.io/badge/version-v2.12.0-blue) |
-| 1-27    | ![Version](https://img.shields.io/badge/version-v2.12.0-blue) |
-| 1-28    | ![Version](https://img.shields.io/badge/version-v2.12.0-blue) |
-| 1-29    | ![Version](https://img.shields.io/badge/version-v2.12.0-blue) |
+| Release | Version                                                       |
+|---------|---------------------------------------------------------------|
+| 1-27    | ![Version](https://img.shields.io/badge/version-v2.13.0-blue) |
+| 1-28    | ![Version](https://img.shields.io/badge/version-v2.13.0-blue) |
+| 1-29    | ![Version](https://img.shields.io/badge/version-v2.13.0-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v2.13.0-blue) |
 
 ### Updating
 

diff --git a/projects/kubernetes-csi/node-driver-registrar/README.md b/projects/kubernetes-csi/node-driver-registrar/README.md
@@ -1,11 +1,11 @@
 ## CSI node-driver-registrar
 
-| Release | Version                                                      |
-|---------|--------------------------------------------------------------|
-| 1-26    | ![Version](https://img.shields.io/badge/version-v2.10.1-blue) |
-| 1-27    | ![Version](https://img.shields.io/badge/version-v2.10.1-blue) |
-| 1-28    | ![Version](https://img.shields.io/badge/version-v2.10.1-blue) |
-| 1-29    | ![Version](https://img.shields.io/badge/version-v2.10.1-blue) |
+| Release | Version                                                       |
+|---------|---------------------------------------------------------------|
+| 1-27    | ![Version](https://img.shields.io/badge/version-v2.11.0-blue) |
+| 1-28    | ![Version](https://img.shields.io/badge/version-v2.11.0-blue) |
+| 1-29    | ![Version](https://img.shields.io/badge/version-v2.11.0-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v2.11.0-blue) |
 
 ### Updating
 

diff --git a/projects/kubernetes-sigs/aws-iam-authenticator/README.md b/projects/kubernetes-sigs/aws-iam-authenticator/README.md
@@ -2,10 +2,10 @@
 
 | Release | Version                                                       |
 |---------|---------------------------------------------------------------|
-| 1-25    | ![Version](https://img.shields.io/badge/version-v0.6.16-blue) |
-| 1-26    | ![Version](https://img.shields.io/badge/version-v0.6.16-blue) |
-| 1-27    | ![Version](https://img.shields.io/badge/version-v0.6.16-blue) |
-| 1-28    | ![Version](https://img.shields.io/badge/version-v0.6.16-blue) |
+| 1-27    | ![Version](https://img.shields.io/badge/version-v0.6.20-blue) |
+| 1-28    | ![Version](https://img.shields.io/badge/version-v0.6.20-blue) |
+| 1-29    | ![Version](https://img.shields.io/badge/version-v0.6.20-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v0.6.20-blue) |
 
 
 ### Updating

diff --git a/projects/kubernetes-sigs/metrics-server/README.md b/projects/kubernetes-sigs/metrics-server/README.md
@@ -2,11 +2,10 @@
 
 | Release | Version                                                      |
 |---------|--------------------------------------------------------------|
-| 1-25    | ![Version](https://img.shields.io/badge/version-v0.7.1-blue) |
-| 1-26    | ![Version](https://img.shields.io/badge/version-v0.7.1-blue) |
 | 1-27    | ![Version](https://img.shields.io/badge/version-v0.7.1-blue) |
 | 1-28    | ![Version](https://img.shields.io/badge/version-v0.7.1-blue) |
 | 1-29    | ![Version](https://img.shields.io/badge/version-v0.7.1-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v0.7.1-blue) |
 
 
 ### Updating

diff --git a/projects/kubernetes/cloud-provider-aws/README.md b/projects/kubernetes/cloud-provider-aws/README.md
@@ -1,10 +1,10 @@
 ## **cloud-provider-aws**
-| Release | Version                                                        |
-|---------|----------------------------------------------------------------|
-| 1-25    | ![Version](https://img.shields.io/badge/version-v1.25.14-blue) |
-| 1-26    | ![Version](https://img.shields.io/badge/version-v1.26.10-blue) |
-| 1-27    | ![Version](https://img.shields.io/badge/version-v1.27.5-blue)  |
-| 1-28    | ![Version](https://img.shields.io/badge/version-v1.28.4-blue)  |
+| Release | Version                                                       |
+|---------|---------------------------------------------------------------|
+| 1-27    | ![Version](https://img.shields.io/badge/version-v1.27.6-blue) |
+| 1-28    | ![Version](https://img.shields.io/badge/version-v1.28.5-blue) |
+| 1-29    | ![Version](https://img.shields.io/badge/version-v1.29.2-blue) |
+| 1-30    | ![Version](https://img.shields.io/badge/version-v1.30.0-blue) |
 
 The AWS cloud provider provides the interface between a Kubernetes cluster and AWS service APIs. This project allows a Kubernetes cluster to provision, monitor and remove AWS resources necessary for operation of the cluster.
 

diff --git a/release/K8_SUPPORTED_RELEASE_BRANCHES b/release/K8_SUPPORTED_RELEASE_BRANCHES
@@ -1,2 +1,4 @@
 1-23
 1-24
+1-25
+1-26