Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass latest or stable to build/push-official-release.sh. #22329

Merged
merged 1 commit into from
Mar 3, 2016
Merged

Pass latest or stable to build/push-official-release.sh. #22329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 0 additions & 43 deletions build/mark-stable-release.sh
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions build/push-official-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
4 changes: 0 additions & 4 deletions docs/devel/releasing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
8 changes: 7 additions & 1 deletion release/build-official-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:

Expand Down