Merge pull request #10451 from k8s-infra-cherrypick-robot/cherry-pick…

…-10444-to-release-1.7 [release-1.7] 📖 update coredns + contributing for v1.7.0
kubernetes-sigs · Apr 17, 2024 · 50d6811 · 50d6811
2 parents 101b0c1 + 7fd527c
commit 50d6811
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -166,7 +166,7 @@ Cluster API maintains the most recent release/releases for all supported API and
 |---------------|--------------|-----------------------------------------------------|
 | v1.7.x        | **v1beta1**  | when v1.9.0 will be released                        |
 | v1.6.x        | **v1beta1**  | when v1.8.0 will be released                        |
-| v1.5.x        | **v1beta1**  | when v1.7.0 will be released                        |
+| v1.5.x        | **v1beta1**  | EOL since 2024-04-16 - v1.7.0 release date          |
 | v1.4.x        | **v1beta1**  | EOL since 2023-12-05 - v1.6.0 release date          |
 | v1.3.x        | **v1beta1**  | EOL since 2023-07-25 - v1.5.0 release date          |
 | v1.2.x        | **v1beta1**  | EOL since 2023-03-28 - v1.4.0 release date          |

diff --git a/docs/book/src/reference/versions.md b/docs/book/src/reference/versions.md
@@ -135,6 +135,7 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
 | v1.5 (v1beta1)       | v1.10.1                         |
 | >= v1.5.1 (v1beta1)  | v1.11.1                         |
 | v1.6 (v1beta1)       | v1.11.1                         |
+| v1.7 (v1beta1)       | v1.11.1                         |
 
 #### Kubernetes version specific notes