From 6f6cb45638f9a75c79134cfddad9fb66d71c92e5 Mon Sep 17 00:00:00 2001
From: Filip Grzadkowski <filipg@google.com>
Date: Fri, 5 Feb 2016 14:42:33 +0100
Subject: [PATCH] Make #19601 backward compatible.

Fixes #20047
---
 build/common.sh                   | 7 +++++++
 build/release.sh                  | 1 +
 release/build-official-release.sh | 2 --
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/common.sh b/build/common.sh
index 198cb6527e..218f6104a7 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -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}"
diff --git a/build/release.sh b/build/release.sh
index e1f0267b71..0c1636adb6 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -39,3 +39,4 @@ fi
 
 kube::build::copy_output
 kube::release::package_tarballs
+kube::release::package_hyperkube
diff --git a/release/build-official-release.sh b/release/build-official-release.sh
index aca04cd724..245481a115 100755
--- a/release/build-official-release.sh
+++ b/release/build-official-release.sh
@@ -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