Defer release notes to announcement of release, and move instructions for release notes back into docs and away from scripts

release/build-official-release.sh

@@ -98,18 +98,13 @@ instructions elsewhere):
 
   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 with the ${KUBE_RELEASE_VERSION} tag.
+  2) Release notes draft, to be published when the release is announced:
 
-     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:
+     a) Title:
 
        Release ${KUBE_RELEASE_VERSION}
 
-     c) Use this template for the description:
+     b) Template for the description:
 
 ## [Documentation](http://releases.k8s.io/${RELEASE_BRANCH}/docs/README.md)
 ## [Examples](http://releases.k8s.io/${RELEASE_BRANCH}/examples)
@@ -124,10 +119,9 @@ binary | hash alg | hash
 
      We'll fill in the release notes in the next stage.
 
-  3) Upload the ${KUBE_BUILD_DIR}/kubernetes.tar.gz to GitHub
+  4) 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).
 
-  4) Ensure all the binaries are in place on GitHub and GCS before cleaning.
-
-  5) (make clean; popd; rm -rf ${KUBE_BUILD_DIR})
+  5) make clean; popd; rm -rf ${KUBE_BUILD_DIR}
 
 EOM

release/cut-official-release.sh

@@ -215,15 +215,9 @@ function alpha-release() {
   git-push "${alpha_version}"
 
   cat >> "${INSTRUCTIONS}" <<- EOM
-- Finish the ${alpha_version} release build:
-  - From this directory (clone of upstream/master),
-      ./release/build-official-release.sh ${alpha_version}
-  - Prep release notes:
-    - Figure out what the PR numbers for this release and last release are, and
-      get an api-token from GitHub (https://github.com/settings/tokens).  From a
-      clone of kubernetes/contrib at upstream/master,
-        go run release-notes/release-notes.go --last-release-pr=<number> --current-release-pr=<number> --api-token=<token>
-      Feel free to prune.
+- Finish the ${alpha_version} release build: from this directory (clone of
+  upstream/master),
+    ./release/build-official-release.sh ${alpha_version}
 EOM
 }
 
@@ -238,12 +232,10 @@ function beta-release() {
   git tag -a -m "Kubernetes pre-release ${beta_version}" "${beta_version}"
   git-push "${beta_version}"
 
-  # NOTE: We currently don't publish beta release notes, since they'll go out
-  # with the official release, so we don't prompt for compiling them here.
   cat >> "${INSTRUCTIONS}" <<- EOM
-- Finish the ${beta_version} release build:
-  - From this directory (clone of upstream/master),
-      ./release/build-official-release.sh ${beta_version}
+- Finish the ${beta_version} release build: from this directory (clone of
+  upstream/master),
+    ./release/build-official-release.sh ${beta_version}
 EOM
 }
 
@@ -259,18 +251,9 @@ function official-release() {
   git-push "${official_version}"
 
   cat >> "${INSTRUCTIONS}" <<- EOM
-- Finish the ${official_version} release build:
-  - From this directory (clone of upstream/master),
-      ./release/build-official-release.sh ${official_version}
-  - Prep release notes:
-    - From this directory (clone of upstream/master), run
-        ./hack/cherry_pick_list.sh ${official_version}
-      to get the release notes for the patch release you just created. Feel
-      free to prune anything internal, but typically for patch releases we tend
-      to include everything in the release notes.
-    - If this is a first official release (vX.Y.0), scan through the release
-      notes for all of the alpha releases since the last cycle, and include
-      anything important in release notes.
+- Finish the ${official_version} release build: from this directory (clone of
+  upstream/master),
+    ./release/build-official-release.sh ${official_version}
 EOM
 }