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

Merge pull request #23605 from mikedanese/pause-kube

Browse Source 
Automatic merge from submit-queue

don't ship kube-registry-proxy and pause images in tars.

pause is built into containervm. if it's not on the machine we should just pull
it. nobody that I'm aware of uses kube-registry-proxy and it makes build/deployment
more complicated and slower.
This commit is contained in:
k8s-merge-robot
2016-04-15 00:26:20 -07:00
parent 8f3c623287 32426d6e97
commit 16e2e87a89
4 changed files with 26 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
build/common.sh
View File

@@ -131,12 +131,6 @@ kube::build::get_docker_wrapped_binaries() {
echo "${targets[@]}"
}
# The set of addons images that should be prepopulated on linux/amd64
readonly KUBE_ADDON_PATHS=(
gcr.io/google_containers/pause:2.0
gcr.io/google_containers/kube-registry-proxy:0.3
)
# ---------------------------------------------------------------------------
# Basic setup functions
@@ -760,11 +754,6 @@ function kube::release::package_server_tarballs() {
kube::release::create_docker_images_for_server "${release_stage}/server/bin" "${arch}"
# Only release addon images for linux/amd64. These addon images aren't necessary for other architectures
if [[ ${platform} == "linux/amd64" ]]; then
kube::release::write_addon_docker_images_for_server "${release_stage}/addons"
fi
# Include the client binaries here too as they are useful debugging tools.
local client_bins=("${KUBE_CLIENT_BINARIES[@]}")
if [[ "${platform%/*}" == "windows" ]]; then
@@ -869,40 +858,6 @@ function kube::release::create_docker_images_for_server() {
}
# This will pull and save docker images for addons which need to placed
# on the nodes directly.
function kube::release::write_addon_docker_images_for_server() {
# Create a sub-shell so that we don't pollute the outer environment
(
local addon_path
for addon_path in "${KUBE_ADDON_PATHS[@]}"; do
(
kube::log::status "Pulling and writing Docker image for addon: ${addon_path}"
local dest_name="${addon_path//\//\~}"
if [[ -z $("${DOCKER[@]}" images | awk '{print ($1":"$2)}' | grep "${addon_path}") ]]; then
kube::log::status "Addon image ${addon_path} does not exist, pulling it..."
"${DOCKER[@]}" pull "${addon_path}"
fi
"${DOCKER[@]}" save "${addon_path}" > "${1}/${dest_name}.tar"
) &
done
if [[ ! -z "${BUILD_PYTHON_IMAGE:-}" ]]; then
(
kube::log::status "Building Docker python image"
local img_name=python:2.7-slim-pyyaml
"${DOCKER[@]}" build -t "${img_name}" "${KUBE_ROOT}/cluster/addons/python-image"
"${DOCKER[@]}" save "${img_name}" > "${1}/${img_name}.tar"
) &
fi
kube::util::wait-for-jobs || { kube::log::error "unable to pull or write addon image"; return 1; }
kube::log::status "Addon images done"
)
}
# Package up the salt configuration tree. This is an optional helper to getting
# a cluster up and running.
function kube::release::package_salt_tarball() {