Skip to content

Commit 37c7fa6

Browse files
authored
Update release.md
1 parent ada0c2a commit 37c7fa6

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

devel/release.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ Make sure changes logs are up to date [here](https://github.com/kubernetes-incub
99
If they are not, follow commits added after last release and update/commit
1010
the change logs to master.
1111

12-
## Release branch
12+
Then based on the release, follow one of next two steps.
13+
14+
## Update pre-release branch
1315

1416
Release branch name should have release-x.x format. All minor and pre-releases
15-
should be on the same branch. To update an existing branch:
17+
should be on the same branch. To update an existing branch with master(only for
18+
latest pre-release):
1619

1720
```bash
18-
export RELEASE_BRANCH=release-x.x
21+
export RELEASE_BRANCH=release-x.y
1922
git checkout $RELEASE_BRANCH
2023
git fetch upstream
2124
git rebase upstream/$RELEASE_BRANCH
@@ -25,6 +28,26 @@ git pull upstream master
2528
You may need to fix some conflicts. For auto-generated files, you can commit
2629
either version. They will be updated to the current version in the next step.
2730

31+
## Patch a release branch
32+
33+
If you are releasing a patch to an existing stable release, you should do a
34+
cherry pick first:
35+
36+
```bash
37+
scripts/cherry_pick_pull.sh
38+
```
39+
40+
Do not merge master into an stable releast branch. Run the script without
41+
parameters and follow its instruction to create cherry pick PR and get the
42+
PR merged then update your local branch:
43+
44+
```bash
45+
export RELEASE_BRANCH=release-x.y
46+
git checkout $RELEASE_BRANCH
47+
git fetch upstream
48+
git rebase upstream/$RELEASE_BRANCH
49+
```
50+
2851
## Sanity check generated client
2952
We need to make sure there is no API changes after running update client
3053
scripts. Such changes should be committed to master branch first. Run this

0 commit comments

Comments
 (0)