Skip to content

Commit 2bf748d

Browse files
authored
Merge pull request #2208 from sbueringer/pr-update-docs
🌱 Update compatibility in README.md
2 parents cf7352a + 8eb5aba commit 2bf748d

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

β€ŽREADME.md

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,12 @@ Check out the [getting started guide](./docs/getting_started.md) for launching a
3131

3232
This provider's versions are compatible with the following versions of Cluster API:
3333

34-
| | Cluster API v1alpha3 (v0.7) | Cluster API v1alpha4 (v0.8) | Cluster API v1beta1 (v1.0) | Cluster API v1beta1 (v1.3) | Cluster API v1beta1 (v1.4) |
35-
|---------------------|:---------------------------:|:---------------------------:|:--------------------------:|:--------------------------:|:-------------------------:|
36-
| CAPV v1alpha3 (v0.7)(deprecated) | βœ“ | βœ“ | βœ“ | βœ“ | β˜“ |
37-
| CAPV v1alpha4 (v0.8)(deprecated) | β˜“ | βœ“ | βœ“ | βœ“ | β˜“ |
38-
| CAPV v1beta1 (v1.0) | β˜“ | β˜“ | βœ“ | βœ“ | β˜“ |
39-
| CAPV v1beta1 (v1.1) | β˜“ | β˜“ | β˜“ | βœ“ | β˜“ |
40-
| CAPV v1beta1 (v1.2) | β˜“ | β˜“ | β˜“ | βœ“ | β˜“ |
41-
| CAPV v1beta1 (v1.3, master) | β˜“ | β˜“ | β˜“ | βœ“ | β˜“ |
42-
| CAPV v1beta1 (v1.4) | β˜“ | β˜“ | β˜“ | βœ“ | β˜“ |
43-
| CAPV v1beta1 (v1.5) | β˜“ | β˜“ | β˜“ | βœ“ | βœ“ |
44-
| CAPV v1beta1 (v1.6) | β˜“ | β˜“ | β˜“ | βœ“ | βœ“ |
45-
| CAPV v1beta1 (v1.7) | β˜“ | β˜“ | β˜“ | βœ“ | βœ“ |
34+
| | Cluster API v1beta1 (v1.3) | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) |
35+
|----------------------------------|:--------------------------:|:--------------------------:|:--------------------------:|
36+
| CAPV v1beta1 (v1.5) | βœ“ | βœ“ | β˜“ |
37+
| CAPV v1beta1 (v1.6) | βœ“ | βœ“ | β˜“ |
38+
| CAPV v1beta1 (v1.7) | βœ“ | βœ“ | β˜“ |
39+
| CAPV v1beta1 (v1.8) | β˜“ | β˜“ | βœ“ |
4640

4741
As CAPV doesn't dictate supported K8s versions, and it supports whatever CAPI supported, about the provider's compatibility with K8s versions, please refer to [CAPI Supported Kubernetes Versions](https://cluster-api.sigs.k8s.io/reference/versions.html).
4842

β€Ždocs/release/release-tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ From this point forward changes which should land in the release have to be cher
151151
i.e. `export USER_FORK=<personal GitHub handle>`
152152
- `kpromo` uses `[email protected]:...` as remote to push the branch for the PR. If you don't have `ssh` set up you can configure
153153
git to use `https` instead via `git config --global url."https://github.com/".insteadOf [email protected]:`.
154-
- This will automatically create a PR in [k8s.io](https://github.com/kubernetes/k8s.io) and assign the CAPI maintainers.
154+
- This will automatically create a PR in [k8s.io](https://github.com/kubernetes/k8s.io) and assign the CAPV maintainers.
155155
4. Merge the PR (/lgtm + /hold cancel) and verify the images are available in the production registry:
156156
- Wait for the [promotion prow job](https://prow.k8s.io/?repo=kubernetes%2Fk8s.io&job=post-k8sio-image-promo) to complete successfully. Then verify that the production images are accessible:
157157

@@ -170,7 +170,7 @@ From this point forward changes which should land in the release have to be cher
170170
7. **For minor releases** Modify `Changes since v1.x.y` to `Changes since v1.x`
171171
**Note**: The release notes tool includes all merges since the previous release branch was branched of.
172172
2. Publish the release and ensure release is flagged as `pre-release` for all `beta` and `rc` releases or `latest` for a new release in the most recent release branch.
173-
6. **For minor releases** Update supported versions in versions.md.
173+
6. **For minor releases** Update supported versions in README.md.
174174

175175
- Cutting a release as of today requires permissions to:
176176
- Create a release tag on the GitHub repository.

0 commit comments

Comments
Β (0)