From 6df84554fcc55acf285de8127442577a21914da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20P=C3=A9rez=20Hern=C3=A1ndez?= Date: Mon, 14 Oct 2019 15:51:23 -0700 Subject: [PATCH] release: lib: revert docker_registry to constant k8s.gcr.io --- build/lib/release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/lib/release.sh b/build/lib/release.sh index 83378c25af1..cb692733456 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -309,7 +309,10 @@ function kube::release::create_docker_images_for_server() { local images_dir="${RELEASE_IMAGES}/${arch}" mkdir -p "${images_dir}" - local -r docker_registry="${KUBE_DOCKER_REGISTRY}" + # k8s.gcr.io is the constant tag in the docker archives, this is also the default for config scripts in GKE. + # We can use KUBE_DOCKER_REGISTRY to include and extra registry in the docker archive. + # If we use KUBE_DOCKER_REGISTRY="k8s.gcr.io", then the extra tag (same) is ignored, see release_docker_image_tag below. + local -r docker_registry="k8s.gcr.io" # Docker tags cannot contain '+' local docker_tag="${KUBE_GIT_VERSION/+/_}" if [[ -z "${docker_tag}" ]]; then