@@ -9,13 +9,16 @@ Make sure changes logs are up to date [here](https://github.com/kubernetes-incub
9
9
If they are not, follow commits added after last release and update/commit
10
10
the change logs to master.
11
11
12
- ## Release branch
12
+ Then based on the release, follow one of next two steps.
13
+
14
+ ## Update pre-release branch
13
15
14
16
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):
16
19
17
20
``` bash
18
- export RELEASE_BRANCH=release-x.x
21
+ export RELEASE_BRANCH=release-x.y
19
22
git checkout $RELEASE_BRANCH
20
23
git fetch upstream
21
24
git rebase upstream/$RELEASE_BRANCH
@@ -25,6 +28,26 @@ git pull upstream master
25
28
You may need to fix some conflicts. For auto-generated files, you can commit
26
29
either version. They will be updated to the current version in the next step.
27
30
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
+
28
51
## Sanity check generated client
29
52
We need to make sure there is no API changes after running update client
30
53
scripts. Such changes should be committed to master branch first. Run this
0 commit comments