scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20710 from fgrzadkowski/backward_compatible_release

Browse Source 
Make #19601 backward compatible.
This commit is contained in:
Marek Grabowski
2016-02-25 15:21:56 +01:00
parent a7f06905c3 6f6cb45638
commit 13d2364444
3 changed files with 8 additions and 2 deletions
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 {} \;
}
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() {
# Clean out any old releases
rm -rf "${RELEASE_DIR}"

1
build/release.sh
View File

@@ -39,3 +39,4 @@ fi
kube::build::copy_output
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}"
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
echo "!!! Tag at invalid point, or something else is bad. Build is dirty. Don't push this build." >&2