diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9e610be4..1166fcea 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -26,3 +26,8 @@ This could be: Additionally, add the breaking label for the release note generation via: /label breaking --> + +/cherry-pick release-v1.34 +/cherry-pick release-v1.35 +/cherry-pick release-v1.36 + diff --git a/docs/release-procedure.md b/docs/release-procedure.md index 8b063cad..9e7d43b4 100644 --- a/docs/release-procedure.md +++ b/docs/release-procedure.md @@ -7,7 +7,7 @@ - [Automated Release Process (Primary Method)](#automated-release-process-primary-method) - [Manual Release Process (Fallback Method)](#manual-release-process-fallback-method) - [Releasing a New Kubernetes Version](#releasing-a-new-kubernetes-version) -- [Remove a old Kubernetes Version](#remove-a-old-kubernetes-version) +- [Remove an Old Kubernetes Version](#remove-an-old-kubernetes-version) ## Overview @@ -57,6 +57,7 @@ Publishing a new release triggers the same Prow release job that builds and publ 4. Update the Renovate configuration via a PR against `main`: add the new release branch to `baseBranchPatterns` and add a new rule in `packageRules` for `/^k8s.io/`. Cherry-pick this PR to all maintained release branches. Example PR: https://github.com/stackitcloud/cloud-provider-stackit/pull/756 5. Create a manual release for the new branch (note: the release tool will only work if there is already a tag on the branch). Do not generate release notes as they will contain many unrelated changes. Just add `Initial release of v1.xx.0` as release notes. 6. Add the new version in the `README.md`. +7. Add the cherry-pick command (`/cherry-pick release-v1.XX`) for the new release branch to `.github/pull_request_template.md`. ## Remove an Old Kubernetes Version @@ -65,4 +66,5 @@ If a Kubernetes version is EOL and it is not possible to create SKE clusters wit 1. Release the version a last time (if there are changes). 2. Remove the release branch in `.github/renovate.json5` under `baseBranchPatterns`. 3. Remove the `packageRules` for the release branch in `.github/renovate.json5`. -4. Remove the version from the `README.md`. \ No newline at end of file +4. Remove the version from the `README.md`. +5. Remove the cherry-pick command (`/cherry-pick release-v1.XX`) for the removed release branch from `.github/pull_request_template.md`.