Merge pull request #17777 from fgrzadkowski/release_docs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-10 21:39:31 -08:00
commit dc88f183e9
2 changed files with 13 additions and 9 deletions

View File

@ -134,7 +134,7 @@ git clone git@github.com:kubernetes/kubernetes.git
cd kubernetes
```
or `git checkout upstream/master` from an existing repo.
or `git fetch upstream && git checkout upstream/master` from an existing repo.
Decide what version you're cutting and export it:
@ -210,9 +210,10 @@ release](https://github.com/kubernetes/kubernetes/releases/new):
1. fill in the release title from the draft;
1. re-run the appropriate release notes tool(s) to pick up any changes people
have made;
1. find the appropriate `kubernetes.tar.gz` in GCS, download it, double check
the hash (compare to what you had in the release notes draft), and attach it
to the release; and
1. find the appropriate `kubernetes.tar.gz` in [GCS bucket](https://
console.developers.google.com/storage/browser/kubernetes-release/release/),
download it, double check the hash (compare to what you had in the release
notes draft), and attach it to the release; and
1. publish!
## Injecting Version into Binaries

View File

@ -52,7 +52,12 @@ VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alph
}
VERSION_MAJOR="${BASH_REMATCH[1]}"
VERSION_MINOR="${BASH_REMATCH[2]}"
RELEASE_BRANCH="release-${VERSION_MAJOR}.${VERSION_MINOR}"
if [[ "$KUBE_RELEASE_VERSION" =~ "alpha" ]]; then
# We don't want to version docs for alpha releases, so we are just pointing to head.
RELEASE_BRANCH="master"
else
RELEASE_BRANCH="release-${VERSION_MAJOR}.${VERSION_MINOR}"
fi
declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX")
@ -117,11 +122,9 @@ binary | hash alg | hash
\`kubernetes.tar.gz\` | md5 | \`${MD5}\`
\`kubernetes.tar.gz\` | sha1 | \`${SHA1}\`
We'll fill in the release notes in the next stage.
4) Ensure all the binaries are in place on GCS before cleaning, (you might
3) Ensure all the binaries are in place on GCS before cleaning, (you might
want to wait until the release is announced and published on GitHub, too).
5) make clean; popd; rm -rf ${KUBE_BUILD_DIR}
4) make clean; popd; rm -rf ${KUBE_BUILD_DIR}
EOM