Skip to content

Commit 89af987

Browse files
authored
Merge pull request kubernetes-sigs#9817 from kranurag7/kr/update-docs-for-1-6
📖 Set 1.4 EOL date and update coredns version table
2 parents 226b816 + a76d2d7 commit 89af987

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,9 @@ Cluster API maintains the most recent release/releases for all supported API and
166166

167167
| Minor Release | API Version | Supported Until |
168168
|---------------|--------------|-----------------------------------------------------|
169+
| v1.6.x | **v1beta1** | when v1.8.0 will be released |
169170
| v1.5.x | **v1beta1** | when v1.7.0 will be released |
170-
| v1.4.x | **v1beta1** | when v1.6.0 will be released, tentatively Nov 2023 |
171+
| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date |
171172
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
172173
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
173174
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |

docs/book/src/reference/versions.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,9 @@ The Kubeadm Control Plane requires the Kubeadm Bootstrap Provider.
138138

139139
| CAPI Version | Max CoreDNS Version for Upgrade |
140140
|----------------------|---------------------------------|
141-
| >= v1.2.7 (v1beta1) | v1.10.0 |
142-
| >= v1.2.11 (v1beta1) | v1.10.1 |
143-
| v1.3 (v1beta1) | v1.10.0 |
144-
| >= v1.3.4 (v1beta1) | v1.10.1 |
145-
| v1.4 (v1beta1) | v1.10.1 |
146-
| >= v1.4.6 (v1beta1) | v1.11.1 |
147141
| v1.5 (v1beta1) | v1.10.1 |
148142
| >= v1.5.1 (v1beta1) | v1.11.1 |
143+
| v1.6 (v1beta1) | v1.11.1 |
149144

150145
#### Kubernetes version specific notes
151146

0 commit comments

Comments
 (0)