Build the hyperkube docker image on-the-fly.

This is only a temporary fix until the proposal in issue
https://github.com/kubernetes/kubernetes/issues/28630 is implemented.

Also, the new build/deployment method completely obviates this step.
This commit is contained in:
Madhusudan.C.S 2016-07-26 13:30:49 -07:00
parent 5a3a84968b
commit b5bea93954

View File

@ -225,58 +225,64 @@ function create-federation-api-objects {
# Required # Required
# FEDERATION_PUSH_REPO_BASE: the docker repo where federated images will be pushed # FEDERATION_PUSH_REPO_BASE: the docker repo where federated images will be pushed
# FEDERATION_IMAGE_TAG: the tag of the image to be pushed
# Optional
# FEDERATION_IMAGE_TAG: push all federated images with this tag. Used for ci testing
function push-federation-images { function push-federation-images {
: "${FEDERATION_PUSH_REPO_BASE?Must set FEDERATION_PUSH_REPO_BASE env var}" : "${FEDERATION_PUSH_REPO_BASE?Must set FEDERATION_PUSH_REPO_BASE env var}"
: "${FEDERATION_IMAGE_TAG?Must set FEDERATION_IMAGE_TAG env var}"
local FEDERATION_BINARIES=${FEDERATION_BINARIES:-"hyperkube"} local FEDERATION_BINARIES=${FEDERATION_BINARIES:-"hyperkube"}
local imageFolder="${KUBE_ROOT}/_output/${KUBE_BUILD_STAGE}/server/${KUBE_PLATFORM}-${KUBE_ARCH}/kubernetes/server/bin" local bin_dir="${KUBE_ROOT}/_output/${KUBE_BUILD_STAGE}/server/${KUBE_PLATFORM}-${KUBE_ARCH}/kubernetes/server/bin"
if [[ ! -d "$imageFolder" ]];then if [[ ! -d "${bin_dir}" ]];then
echo "${imageFolder} does not exist! Run make quick-release or make release" echo "${bin_dir} does not exist! Run make quick-release or make release"
exit 1 exit 1
fi fi
for binary in $FEDERATION_BINARIES;do for binary in ${FEDERATION_BINARIES}; do
local imageFile="${imageFolder}/${binary}.tar" local bin_path="${bin_dir}/${binary}"
if [[ ! -f "$imageFile" ]];then if [[ ! -f "${bin_path}" ]]; then
echo "${imageFile} does not exist!" echo "${bin_path} does not exist!"
exit 1 exit 1
fi fi
echo "Load: ${imageFile}" local docker_build_path="${bin_path}.dockerbuild"
# Load the image. Trust we know what it's called, as docker load provides no help there :( local docker_file_path="${docker_build_path}/Dockerfile"
docker load < "${imageFile}"
local srcImageTag="$(cat ${imageFolder}/${binary}.docker_tag)" rm -rf ${docker_build_path}
local dstImageTag="${FEDERATION_IMAGE_TAG:-$srcImageTag}" mkdir -p ${docker_build_path}
local srcImageName="${FEDERATION_IMAGE_REPO_BASE}/${binary}:${srcImageTag}"
local dstImageName="${FEDERATION_PUSH_REPO_BASE}/${binary}:${dstImageTag}"
echo "Tag: ${srcImageName} --> ${dstImageName}" ln "${bin_path}" "${docker_build_path}/${binary}"
docker tag -f "$srcImageName" "$dstImageName" printf " FROM busybox \n ADD ${binary} /usr/local/bin/${binary}\n" > ${docker_file_path}
echo "Push: $dstImageName" local docker_image_tag="${FEDERATION_PUSH_REPO_BASE}/${binary}:${FEDERATION_IMAGE_TAG}"
if [[ "${FEDERATION_PUSH_REPO_BASE}" == "gcr.io/"* ]];then
echo " -> GCR repository detected. Using gcloud"
gcloud docker push "$dstImageName"
else
docker push "$dstImageName"
fi
echo "Remove: $srcImageName" # Build the docker image on-the-fly.
docker rmi "$srcImageName" #
# NOTE: This is only a temporary fix until the proposal in issue
# https://github.com/kubernetes/kubernetes/issues/28630 is implemented.
# Also, the new turn up mechanism completely obviates this step.
#
# TODO(madhusudancs): Remove this code when the new turn up mechanism work
# is merged.
kube::log::status "Building docker image ${docker_image_tag} from the binary"
docker build -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
if [[ "$srcImageName" != "dstImageName" ]];then rm -rf ${docker_build_path}
echo "Remove: $dstImageName"
docker rmi "$dstImageName"
fi
kube::log::status "Pushing ${docker_image_tag}"
if [[ "${FEDERATION_PUSH_REPO_BASE}" == "gcr.io/"* ]]; then
echo " -> GCR repository detected. Using gcloud"
gcloud docker push "${docker_image_tag}"
else
docker push "${docker_image_tag}"
fi
kube::log::status "Deleting docker image ${docker_image_tag}"
docker rmi "${docker_image_tag}" 2>/dev/null || true
done done
} }
function cleanup-federation-api-objects { function cleanup-federation-api-objects {
# Delete all resources with the federated-cluster label. # Delete all resources with the federated-cluster label.
$host_kubectl delete pods,svc,rc,deployment,secret -lapp=federated-cluster $host_kubectl delete pods,svc,rc,deployment,secret -lapp=federated-cluster