Skip to content

Commit

Permalink
Update release.md
Browse files Browse the repository at this point in the history
  • Loading branch information
mbohlool authored May 4, 2017
1 parent ada0c2a commit 37c7fa6
Showing 1 changed file with 26 additions and 3 deletions.
29 changes: 26 additions & 3 deletions devel/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ Make sure changes logs are up to date [here](https://github.com/kubernetes-incub
If they are not, follow commits added after last release and update/commit
the change logs to master.

## Release branch
Then based on the release, follow one of next two steps.

## Update pre-release branch

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

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

## Patch a release branch

If you are releasing a patch to an existing stable release, you should do a
cherry pick first:

```bash
scripts/cherry_pick_pull.sh
```

Do not merge master into an stable releast branch. Run the script without
parameters and follow its instruction to create cherry pick PR and get the
PR merged then update your local branch:

```bash
export RELEASE_BRANCH=release-x.y
git checkout $RELEASE_BRANCH
git fetch upstream
git rebase upstream/$RELEASE_BRANCH
```

## Sanity check generated client
We need to make sure there is no API changes after running update client
scripts. Such changes should be committed to master branch first. Run this
Expand Down

0 comments on commit 37c7fa6

Please sign in to comment.