Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(rotate): instructions touchups #4259

Merged
merged 12 commits into from
Jun 4, 2024
Merged

chore(rotate): instructions touchups #4259

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4ff4c8c
Update rotate.md
iliapolo Jun 4, 2024
a97c84c
Update rotate.md
iliapolo Jun 4, 2024
a5ac45b
Update rotate.md
iliapolo Jun 4, 2024
3057ebf
Update rotate.md
iliapolo Jun 4, 2024
aae9d9b
Update rotate.md
iliapolo Jun 4, 2024
facc4ef
Update rotate.md
iliapolo Jun 4, 2024
89f1c99
Update rotate.md
iliapolo Jun 4, 2024
7efcfc7
Update rotate.md
iliapolo Jun 4, 2024
9baef14
Update rotate.md
iliapolo Jun 4, 2024
81f770f
Update rotate.md
iliapolo Jun 4, 2024
fbcdc6a
Update rotate.md
iliapolo Jun 4, 2024
4c7da36
Merge branch 'k8s-30/main' into epolon/rotation-instructions-fixes
iliapolo Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions rotate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,25 @@ on the latest kubernetes version. These steps should be executed in order.
6. Create a new branch in the [cdk8s-plus](https://github.com/cdk8s-team/cdk8s-plus) off the current default branch.
The new branch should be named `k8s-XX/main` (e.g. `k8s-25/main` for K8s v1.25.0).

7. On the new branch update the following:
7. On a new branch, based off `k8s-XX/main`, do the following:

1. Bump the minor version in [latest-k8s-version.txt](./projenrc/latest-k8s-version.txt)
2. ([`README.md`](./README.md)): In the table of supported versions, add a new row and remove the oldest one.
3. `yarn projen`
4. `yarn rotate` # updates all version references in documenation
5. `yarn build`
6. `git commit -m "k8s-XX/main"`
7. `git push origin k8s-XX/main"`
6. Create a PR to the `k8s-XX/main` branch. (See [example](https://github.com/cdk8s-team/cdk8s-plus/pull/4260)).

8. Verify that automation builds/tags/releases the new version successfully.
8. Wait for the PR above to be merged and verify that automation builds/tags/releases the new version successfully.

9. Update cdk8s-plus default branch to the new branch in the [GitHub repo settings](https://github.com/cdk8s-team/cdk8s-plus/settings/branches).

10. Update any existing PRs to use k8s-XX/main as the base.

11. Rotate the backport labels on existing PRs. (for exmaple when rotating from k8s.29 to k8s.30, remove the `backport-to-k8s-27/main` label and add the `backport-to-k8s-29/main` label.

12. Delete the `backport-to-k8s-(XX - 3)/main` label. (for exmaple when rotating from k8s.29 to k8s.30, delete the `backport-to-k8s-27/main` label

## :three: Update Website

In the ([cdk8s repo](https://github.com/cdk8s-team/cdk8s)):
Expand All @@ -67,7 +70,7 @@ In the ([cdk8s repo](https://github.com/cdk8s-team/cdk8s)):
2. `yarn projen`
3. `yarn rotate-cdk8s-plus`

12. Create a PR for the new branch, review then merge into cdk8s/master branch.
12. Create a PR for the new branch, review then merge into cdk8s/master branch. (See [example](https://github.com/cdk8s-team/cdk8s/pull/1988))

## :four: Update Ops

Expand All @@ -78,4 +81,4 @@ In the ([cdk-ops](https://github.com/cdklabs/cdk-ops)):
1. Bump the minor version in [latest-cdk8s-plus-version.txt](https://github.com/cdklabs/cdk-ops/blob/master/latest-cdk8s-plus-version.txt)
2. `yarn projen`

14. Create a PR and send for approval.
14. Create a PR and send for approval. (See [example](https://github.com/cdklabs/cdk-ops/pull/3323))
Loading