github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Make #19601 backward compatible.

Browse Source 
Fixes #20047
This commit is contained in:
Filip Grzadkowski 2016-02-05 14:42:33 +01:00
parent a7f06905c3
commit 6f6cb45638
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/common.sh
View File

@ -667,6 +667,13 @@ function kube::release::clean_cruft() {
find ${RELEASE_STAGE} -name '.DS*' -exec rm {} \; find ${RELEASE_STAGE} -name '.DS*' -exec rm {} \;
} }
function kube::release::package_hyperkube() {
# If we have these variables set then we want to build all docker images.
if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" ]]; then
REGISTRY="${KUBE_DOCKER_REGISTRY}" VERSION="${KUBE_DOCKER_IMAGE_TAG}" make -C cluster/images/hyperkube/ build
fi
}
function kube::release::package_tarballs() { function kube::release::package_tarballs() {
# Clean out any old releases # Clean out any old releases
rm -rf "${RELEASE_DIR}" rm -rf "${RELEASE_DIR}"

1
build/release.sh
View File

@ -39,3 +39,4 @@ fi
kube::build::copy_output kube::build::copy_output
kube::release::package_tarballs kube::release::package_tarballs
kube::release::package_hyperkube

2
release/build-official-release.sh
View File

@ -91,8 +91,6 @@ export KUBE_DOCKER_REGISTRY="gcr.io/google_containers"
export KUBE_DOCKER_IMAGE_TAG="${KUBE_RELEASE_VERSION}" export KUBE_DOCKER_IMAGE_TAG="${KUBE_RELEASE_VERSION}"
make release make release
# We don't want to include this in 'make release' as it'd slow down every day development cycle.
REGISTRY="${KUBE_DOCKER_REGISTRY}" VERSION="${KUBE_DOCKER_IMAGE_TAG}" make -C cluster/images/hyperkube/ build
if ${KUBE_BUILD_DIR}/cluster/kubectl.sh version | grep Client | grep dirty; then if ${KUBE_BUILD_DIR}/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 echo "!!! Tag at invalid point, or something else is bad. Build is dirty. Don't push this build." >&2