Skip to content

Commit c656fa8

Browse files
authored
Update k8s-release-cut.md
1 parent 0940dac commit c656fa8

File tree

1 file changed

+8
-47
lines changed

1 file changed

+8
-47
lines changed

release-engineering/handbooks/k8s-release-cut.md

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -317,50 +317,7 @@ Do not run the release command yet, just copy it somewhere and wait for the imag
317317

318318
## 7. Image promotion
319319

320-
Promote the images (`alpha`, `beta` or `rc`) using `kpromo`. The tool will automatically create / open a PR with the images and tags properly promoted.
321-
322-
### Which image should be promoted?
323-
324-
The images that need to be promoted depend on the release you're cutting:
325-
326-
- **Alpha or Beta release:** just promote the images for the release you're cutting (e.g. v1.20.0-beta.1)
327-
- **The first RC (e.g. v1.20.0-rc.0):** promote the images for the RC and for the next minor alpha release (e.g. v1.21.0-alpha.0) in two separate kpromo commands/PRs
328-
- **The subsequent RCs (e.g. v1.20.0-rc.1):** promote the images for the RC you're cutting (e.g. v1.20.0-rc.1)
329-
- **A stable release (e.g. v1.33.0):** promote the images for the release you're cutting (e.g. v1.33.0)
330-
331-
Some examples can be found below:
332-
333-
> [!WARNING]
334-
Even if it's possible to open a single PR for multiple promos it is not recommended due to the extreme amount of resources used by the double promotion job. Promo one image at a time.
335-
336-
```
337-
kpromo pr --fork=jimangel --tag="v1.29.0-alpha.1"
338-
339-
# RC
340-
kpromo pr --fork=jimangel --tag="v1.32.0-rc.1"
341-
#or
342-
kpromo pr --fork=jimangel --tag="v1.29.0-rc.0" --tag="v1.30.0-alpha.0"
343-
```
344-
345-
### Run kpromo (opens the PR)
346-
347-
> [!IMPORTANT]
348-
If promoting the first release candidate (rc), include the next release alpha as follows.
349-
350-
```
351-
kpromo pr --fork=<your-username> --tag="v1.xx.yy-rc-z" --tag="v1.xx+1.yy-alpha-0"
352-
```
353-
354-
> [!TIP]
355-
Multiple tags can be specified with the `kpromo` pr command
356-
357-
This is the standard command to be run ([source](https://github.com/kubernetes-sigs/promo-tools/blob/main/docs/promotion-pull-requests.md#promoting-images)):
358-
359-
```
360-
# --interactive=true asks confirmation before every step, highly recommended
361-
362-
kpromo pr --fork=<your-username> --tag="v1.xx.yy-alpha|beta|rc-z" --interactive=true
363-
```
320+
Complete docs can be found [here](https://github.com/kubernetes-sigs/promo-tools/blob/main/docs/promotion-pull-requests.md)
364321

365322
> [!WARNING]
366323
`FATA growing manifest with image filter [] and tag [1.29.0-alpha.1]: no images survived filtering; double-check your --filter_* flag(s) for typos`
@@ -373,12 +330,16 @@ INFO Successfully created PR #xxxx
373330
INFO Successfully created PR: https://github.com/kubernetes/k8s.io/pull/xxxx
374331
```
375332

376-
### Merge PR
333+
### Merge promo PR
377334

378335
Wait for the generated PR to be merged (after approval and LGTM).
379336
You might wanna ping @release-managers on Slack to speed this process up.
380337

381-
**The PR is not blocked by anything but approvals / review.**
338+
**The PR has no dependencies outside of approvals / review.**
339+
340+
> [!CAUTION]
341+
In case a blocking test goes red during the release cut, you should keep the PR held and reach a consesus with @release-managers that the promo can continue.
342+
e.g. if a test went red for infra flakyness "Node not ready" it's probably ok to continue, but it's always better to double check.
382343

383344
> [Example PR](https://github.com/kubernetes/k8s.io/pull/3024).
384345
@@ -555,5 +516,5 @@ git push -u origin schedule-updates-oct-2024
555516

556517
## Cleanup
557518

558-
Close out related issues, open new issues if you find any, and ask Google admins to revoke your personal access to GCP if it is no longer required.
519+
Close the release cut issue and possibly related issues, open new issues if you find any docs or feature missing, and ask Google admins to revoke your personal access to GCP if it is no longer required.
559520
You might want to delete your GitHub access token too.

0 commit comments

Comments
 (0)