github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the registry for the server-images templated in the Dockerfiles.

Browse Source
This commit is contained in:
Vinayak Goyal
2021-02-23 13:33:42 -08:00
parent 87f5ee31bd
commit b4c330ab72
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/common.sh
View File

@@ -86,8 +86,9 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
readonly KUBE_CONTAINER_RSYNC_PORT=8730
# Get the set of master binaries that run in Docker (on Linux)
# Entry format is "<name-of-binary>,<base-image>".
# Entry format is "<name-of-binary>,<base-image-name>:<base-image-version>".
# Binaries are placed in /usr/local/bin inside the image.
# When building these images the registry for the base images is considered to be ${KUBE_BASE_IMAGE_REGISTRY}.
#
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
@@ -96,10 +97,10 @@ kube::build::get_docker_wrapped_binaries() {
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets
local targets=(
"kube-apiserver,${KUBE_BASE_IMAGE_REGISTRY}/go-runner:${go_runner_version}"
"kube-controller-manager,${KUBE_BASE_IMAGE_REGISTRY}/go-runner:${go_runner_version}"
"kube-scheduler,${KUBE_BASE_IMAGE_REGISTRY}/go-runner:${go_runner_version}"
"kube-proxy,${KUBE_BASE_IMAGE_REGISTRY}/debian-iptables:${debian_iptables_version}"
"kube-apiserver,go-runner:${go_runner_version}"
"kube-controller-manager,go-runner:${go_runner_version}"
"kube-scheduler,go-runner:${go_runner_version}"
"kube-proxy,debian-iptables:${debian_iptables_version}"
)
echo "${targets[@]}"