Merge pull request #22329 from david-mcmahon/push-official

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-03 08:52:35 -08:00
commit a511961cc8
4 changed files with 12 additions and 51 deletions

View File

@ -1,43 +0,0 @@
#!/bin/bash
# Copyright 2015 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Marks the current stable version
set -o errexit
set -o nounset
set -o pipefail
if [ "$#" -ne 1 ]; then
echo "Usage: ${0} <version>"
exit 1
fi
KUBE_RELEASE_VERSION="${1-}"
KUBE_GCS_MAKE_PUBLIC='y'
KUBE_GCS_RELEASE_BUCKET='kubernetes-release'
KUBE_GCS_RELEASE_PREFIX="release/${KUBE_RELEASE_VERSION}"
KUBE_GCS_PUBLISH_VERSION="${KUBE_RELEASE_VERSION}"
KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
source "${KUBE_ROOT}/build/common.sh"
if "${KUBE_ROOT}/cluster/kubectl.sh" 'version' | grep 'Client' | grep 'dirty'; then
echo "!!! Tag at invalid point, or something else is bad. Build is dirty. Don't push this build." >&2
exit 1
fi
kube::release::gcs::publish_official 'stable'

View File

@ -20,12 +20,14 @@ set -o errexit
set -o nounset
set -o pipefail
if [ "$#" -ne 1 ]; then
echo "Usage: ${0} <version>"
if [[ "$#" -lt 1 ]]; then
echo "Usage: ${0} <version> [<type>]"
echo "(<type> defaults to 'latest')"
exit 1
fi
KUBE_RELEASE_VERSION="${1-}"
KUBE_RELEASE_TYPE="${2:-"latest"}"
KUBE_GCS_NO_CACHING='n'
KUBE_GCS_MAKE_PUBLIC='y'
@ -53,4 +55,4 @@ fi
kube::release::parse_and_validate_release_version "${KUBE_RELEASE_VERSION}"
kube::release::gcs::release
kube::release::docker::release
kube::release::gcs::publish_official 'latest'
kube::release::gcs::publish_official $KUBE_RELEASE_TYPE

View File

@ -213,10 +213,6 @@ release](https://github.com/kubernetes/kubernetes/releases/new):
notes draft), and attach it to the release; and
1. publish!
Finally, from a clone of upstream/master, *make sure* you still have
`RELEASE_VERSION` set correctly, and run `./build/mark-stable-release.sh
${RELEASE_VERSION}`.
### Manual tasks for new release series
*TODO(#20946) Burn this list down.*

View File

@ -59,6 +59,12 @@ else
RELEASE_BRANCH="release-${VERSION_MAJOR}.${VERSION_MINOR}"
fi
if [[ "$KUBE_RELEASE_VERSION" =~ alpha|beta ]]; then
KUBE_RELEASE_TYPE="latest"
else
KUBE_RELEASE_TYPE="stable"
fi
declare -r KUBE_BUILD_DIR=$(mktemp -d "/tmp/kubernetes-build-release-${KUBE_RELEASE_VERSION}-XXXXXXX")
# Set the default umask for the release. This ensures consistency
@ -107,7 +113,7 @@ cat <<- EOM
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}
1) pushd ${KUBE_BUILD_DIR}; build/push-official-release.sh ${KUBE_RELEASE_VERSION} ${KUBE_RELEASE_TYPE}
2) Release notes draft, to be published when the release is announced: