Skip to content

Commit

Permalink
Merge pull request #2208 from sbueringer/pr-update-docs
Browse files Browse the repository at this point in the history 
🌱  Update compatibility in README.md
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Aug 14, 2023
2 parents cf7352a + 8eb5aba commit 2bf748d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
18 changes: 6 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,12 @@ Check out the [getting started guide](./docs/getting_started.md) for launching a

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

| | 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) |
|---------------------|:---------------------------:|:---------------------------:|:--------------------------:|:--------------------------:|:-------------------------:|
| CAPV v1alpha3 (v0.7)(deprecated) | ✓ | ✓ | ✓ | ✓ | ☓ |
| CAPV v1alpha4 (v0.8)(deprecated) | ☓ | ✓ | ✓ | ✓ | ☓ |
| CAPV v1beta1 (v1.0) | ☓ | ☓ | ✓ | ✓ | ☓ |
| CAPV v1beta1 (v1.1) | ☓ | ☓ | ☓ | ✓ | ☓ |
| CAPV v1beta1 (v1.2) | ☓ | ☓ | ☓ | ✓ | ☓ |
| CAPV v1beta1 (v1.3, master) | ☓ | ☓ | ☓ | ✓ | ☓ |
| CAPV v1beta1 (v1.4) | ☓ | ☓ | ☓ | ✓ | ☓ |
| CAPV v1beta1 (v1.5) | ☓ | ☓ | ☓ | ✓ | ✓ |
| CAPV v1beta1 (v1.6) | ☓ | ☓ | ☓ | ✓ | ✓ |
| CAPV v1beta1 (v1.7) | ☓ | ☓ | ☓ | ✓ | ✓ |
| | Cluster API v1beta1 (v1.3) | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) |
|----------------------------------|:--------------------------:|:--------------------------:|:--------------------------:|
| CAPV v1beta1 (v1.5) | ✓ | ✓ | ☓ |
| CAPV v1beta1 (v1.6) | ✓ | ✓ | ☓ |
| CAPV v1beta1 (v1.7) | ✓ | ✓ | ☓ |
| CAPV v1beta1 (v1.8) | ☓ | ☓ | ✓ |

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).

Expand Down
4 changes: 2 additions & 2 deletions docs/release/release-tasks.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ From this point forward changes which should land in the release have to be cher
i.e. `export USER_FORK=<personal GitHub handle>`
- `kpromo` uses `[email protected]:...` as remote to push the branch for the PR. If you don't have `ssh` set up you can configure
git to use `https` instead via `git config --global url."https://github.com/".insteadOf [email protected]:`.
- This will automatically create a PR in [k8s.io](https://github.com/kubernetes/k8s.io) and assign the CAPI maintainers.
- This will automatically create a PR in [k8s.io](https://github.com/kubernetes/k8s.io) and assign the CAPV maintainers.
4. Merge the PR (/lgtm + /hold cancel) and verify the images are available in the production registry:
- 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:

Expand All @@ -170,7 +170,7 @@ From this point forward changes which should land in the release have to be cher
7. **For minor releases** Modify `Changes since v1.x.y` to `Changes since v1.x`
**Note**: The release notes tool includes all merges since the previous release branch was branched of.
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.
6. **For minor releases** Update supported versions in versions.md.
6. **For minor releases** Update supported versions in README.md.

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

0 comments on commit 2bf748d

Please sign in to comment.