From e3dce4970cbc854a92dc9bd4095accb9014985ec Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 5 Nov 2015 15:51:42 -0800 Subject: [PATCH 1/4] Rework instructions in build-official-release to clarify --- release/build-official-release.sh | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/release/build-official-release.sh b/release/build-official-release.sh index 1e8f982e5ec..0ccf6ae5e34 100755 --- a/release/build-official-release.sh +++ b/release/build-official-release.sh @@ -90,15 +90,23 @@ SHA1=$(sha1 "${KUBE_BUILD_DIR}/kubernetes.tar.gz") cat <<- EOM -Success! You must now do the following (you may want to cut and paste these +Success! You must now do the following (you may want to cut and paste these instructions elsewhere): - 1) (cd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION}) + 1) pushd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION} + 2) Go to https://github.com/GoogleCloudPlatform/kubernetes/releases - and create a new 'Release ${KUBE_RELEASE_VERSION} Candidate' release - with the ${KUBE_RELEASE_VERSION} tag. Mark it as a pre-release. - 3) Upload the ${KUBE_BUILD_DIR}/kubernetes.tar.gz to GitHub - 4) Use this template for the release: + and create a new release with the ${KUBE_RELEASE_VERSION} tag. + + a) Mark it as a pre-release (someone on the GKE team will mark it as an + official release when it's being rolled out, but should not be considered + stable prior to that). + + b) Title it: + + Release ${KUBE_RELEASE_VERSION} + + c) Use this template for the description: ## [Documentation](http://releases.k8s.io/${KUBE_RELEASE_VERSION}/docs/README.md) ## [Examples](http://releases.k8s.io/${KUBE_RELEASE_VERSION}/examples) @@ -112,7 +120,11 @@ binary | hash alg | hash \`kubernetes.tar.gz\` | sha1 | \`${SHA1}\` We'll fill in the release notes in the next stage. - 5) Ensure all the binaries are in place on GitHub and GCS before cleaning. - 6) (cd ${KUBE_BUILD_DIR}; make clean; cd -; rm -rf ${KUBE_BUILD_DIR}) + + 3) Upload the ${KUBE_BUILD_DIR}/kubernetes.tar.gz to GitHub + + 4) Ensure all the binaries are in place on GitHub and GCS before cleaning. + + 5) (make clean; popd; rm -rf ${KUBE_BUILD_DIR}) EOM From 2efc78c38d0c504135864f37b05b7a4f7449e220 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 6 Nov 2015 10:22:49 -0800 Subject: [PATCH 2/4] Spacing --- release/build-official-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/build-official-release.sh b/release/build-official-release.sh index 0ccf6ae5e34..9c42e3df33a 100755 --- a/release/build-official-release.sh +++ b/release/build-official-release.sh @@ -90,7 +90,7 @@ SHA1=$(sha1 "${KUBE_BUILD_DIR}/kubernetes.tar.gz") cat <<- EOM -Success! You must now do the following (you may want to cut and paste these +Success! You must now do the following (you may want to cut and paste these instructions elsewhere): 1) pushd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION} From b7347b418c6cdedc90574dd13bd493152a7b31f0 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 6 Nov 2015 10:29:58 -0800 Subject: [PATCH 3/4] Point docs and examples to HEAD of release branch --- release/build-official-release.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/build-official-release.sh b/release/build-official-release.sh index 9c42e3df33a..0cea3db703c 100755 --- a/release/build-official-release.sh +++ b/release/build-official-release.sh @@ -50,6 +50,9 @@ VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alph echo "!!! You must specify the version you are releasing in the form of '${VERSION_REGEX}'" >&2 exit 1 } +VERSION_MAJOR="${BASH_REMATCH[1]}" +VERSION_MINOR="${BASH_REMATCH[2]}" +RELEASE_BRANCH="release-${VERSION_MAJOR}.${VERSION_MINOR}" declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX") @@ -108,8 +111,8 @@ instructions elsewhere): c) Use this template for the description: -## [Documentation](http://releases.k8s.io/${KUBE_RELEASE_VERSION}/docs/README.md) -## [Examples](http://releases.k8s.io/${KUBE_RELEASE_VERSION}/examples) +## [Documentation](http://releases.k8s.io/${RELEASE_BRANCH}/docs/README.md) +## [Examples](http://releases.k8s.io/${RELEASE_BRANCH}/examples) ## Changes since (last PR ) From a67042bd5f3aac73dcf4d01f70d45ed94e099911 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 6 Nov 2015 10:32:05 -0800 Subject: [PATCH 4/4] Use ./ notation --- docs/devel/releasing.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/devel/releasing.md b/docs/devel/releasing.md index 238f3791523..60609f0d04c 100644 --- a/docs/devel/releasing.md +++ b/docs/devel/releasing.md @@ -145,7 +145,7 @@ export VER="vX.Y.0-alpha.W" then, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" +./release/cut-official-release.sh "${VER}" "${GITHASH}" ``` This will do a dry run of: @@ -157,7 +157,7 @@ This will do a dry run of: If you're satisfied with the result, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run +./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run ``` and follow the instructions. @@ -173,7 +173,7 @@ export VER="vX.Y.Z-beta.W" then, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" +./release/cut-official-release.sh "${VER}" "${GITHASH}" ``` This will do a dry run of: @@ -186,7 +186,7 @@ This will do a dry run of: If you're satisfied with the result, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run +./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run ``` and follow the instructions. @@ -202,7 +202,7 @@ export VER="vX.Y.Z" then, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" +./release/cut-official-release.sh "${VER}" "${GITHASH}" ``` This will do a dry run of: @@ -218,7 +218,7 @@ This will do a dry run of: If you're satisfied with the result, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run +./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run ``` and follow the instructions. @@ -238,7 +238,7 @@ export VER="vX.Y" then, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" +./release/cut-official-release.sh "${VER}" "${GITHASH}" ``` This will do a dry run of: @@ -253,7 +253,7 @@ This will do a dry run of: If you're satisfied with the result, run ```console -release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run +./release/cut-official-release.sh "${VER}" "${GITHASH}" --no-dry-run ``` and follow the instructions.