mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Merge pull request #69779 from dims/remove-last-traces-of-old-registry-name
Remove last traces of old registry name
This commit is contained in:
commit
e42f52150e
@ -72,7 +72,6 @@ DOCKERIZED_BINARIES = {
|
|||||||
|
|
||||||
[container_bundle(
|
[container_bundle(
|
||||||
name = binary,
|
name = binary,
|
||||||
# TODO(thockin): remove the google_containers name after release 1.11.
|
|
||||||
images = {
|
images = {
|
||||||
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
|
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
|
||||||
},
|
},
|
||||||
|
@ -326,10 +326,6 @@ function kube::release::create_docker_images_for_server() {
|
|||||||
mkdir -p "${images_dir}"
|
mkdir -p "${images_dir}"
|
||||||
|
|
||||||
local -r docker_registry="k8s.gcr.io"
|
local -r docker_registry="k8s.gcr.io"
|
||||||
# TODO(thockin): Remove all traces of this after 1.11 release.
|
|
||||||
# The following is the old non-indirected registry name. To ease the
|
|
||||||
# transition to the new name (above), we are double-tagging saved images.
|
|
||||||
local -r deprecated_registry="gcr.io/google_containers"
|
|
||||||
# Docker tags cannot contain '+'
|
# Docker tags cannot contain '+'
|
||||||
local docker_tag="${KUBE_GIT_VERSION/+/_}"
|
local docker_tag="${KUBE_GIT_VERSION/+/_}"
|
||||||
if [[ -z "${docker_tag}" ]]; then
|
if [[ -z "${docker_tag}" ]]; then
|
||||||
@ -350,17 +346,14 @@ function kube::release::create_docker_images_for_server() {
|
|||||||
local docker_file_path="${docker_build_path}/Dockerfile"
|
local docker_file_path="${docker_build_path}/Dockerfile"
|
||||||
local binary_file_path="${binary_dir}/${binary_name}"
|
local binary_file_path="${binary_dir}/${binary_name}"
|
||||||
local docker_image_tag="${docker_registry}"
|
local docker_image_tag="${docker_registry}"
|
||||||
local deprecated_image_tag="${deprecated_registry}"
|
|
||||||
if [[ ${arch} == "amd64" ]]; then
|
if [[ ${arch} == "amd64" ]]; then
|
||||||
# If we are building a amd64 docker image, preserve the original
|
# If we are building a amd64 docker image, preserve the original
|
||||||
# image name
|
# image name
|
||||||
docker_image_tag+="/${binary_name}:${docker_tag}"
|
docker_image_tag+="/${binary_name}:${docker_tag}"
|
||||||
deprecated_image_tag+="/${binary_name}:${docker_tag}"
|
|
||||||
else
|
else
|
||||||
# If we are building a docker image for another architecture,
|
# If we are building a docker image for another architecture,
|
||||||
# append the arch in the image tag
|
# append the arch in the image tag
|
||||||
docker_image_tag+="/${binary_name}-${arch}:${docker_tag}"
|
docker_image_tag+="/${binary_name}-${arch}:${docker_tag}"
|
||||||
deprecated_image_tag+="/${binary_name}-${arch}:${docker_tag}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -380,8 +373,7 @@ EOF
|
|||||||
echo "COPY nsswitch.conf /etc/" >> "${docker_file_path}"
|
echo "COPY nsswitch.conf /etc/" >> "${docker_file_path}"
|
||||||
fi
|
fi
|
||||||
"${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" "${docker_build_path}" >/dev/null
|
"${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" "${docker_build_path}" >/dev/null
|
||||||
"${DOCKER[@]}" tag "${docker_image_tag}" "${deprecated_image_tag}" >/dev/null
|
"${DOCKER[@]}" save "${docker_image_tag}" > "${binary_dir}/${binary_name}.tar"
|
||||||
"${DOCKER[@]}" save "${docker_image_tag}" "${deprecated_image_tag}" > "${binary_dir}/${binary_name}.tar"
|
|
||||||
echo "${docker_tag}" > "${binary_dir}/${binary_name}.docker_tag"
|
echo "${docker_tag}" > "${binary_dir}/${binary_name}.docker_tag"
|
||||||
rm -rf "${docker_build_path}"
|
rm -rf "${docker_build_path}"
|
||||||
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
|
ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
|
||||||
@ -400,7 +392,6 @@ EOF
|
|||||||
# not a release
|
# not a release
|
||||||
kube::log::status "Deleting docker image ${docker_image_tag}"
|
kube::log::status "Deleting docker image ${docker_image_tag}"
|
||||||
"${DOCKER[@]}" rmi "${docker_image_tag}" &>/dev/null || true
|
"${DOCKER[@]}" rmi "${docker_image_tag}" &>/dev/null || true
|
||||||
"${DOCKER[@]}" rmi "${deprecated_image_tag}" &>/dev/null || true
|
|
||||||
fi
|
fi
|
||||||
) &
|
) &
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user