github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108712 from dims/support-ci-jobs-that-use-prebuilt-images-by-adding-additional-image-tags

Browse Source 
Support CI jobs that use prebuilt-images by adding additional image tags
This commit is contained in:
Kubernetes Prow Robot 2022-03-15 21:59:48 -07:00 committed by GitHub
commit 1007f4974d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/gce/gci/configure.sh
View File

@ -457,8 +457,10 @@ function try-load-docker-image {
if [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" || "${CONTAINERD_TEST:-}" == "containerd" ]]; then if [[ "${CONTAINER_RUNTIME_NAME:-}" == "containerd" || "${CONTAINERD_TEST:-}" == "containerd" ]]; then
load_image_command=${LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import} load_image_command=${LOAD_IMAGE_COMMAND:-ctr -n=k8s.io images import}
tag_image_command=${TAG_IMAGE_COMMAND:-ctr -n=k8s.io images tag}
else else
load_image_command="${LOAD_IMAGE_COMMAND:-}" load_image_command="${LOAD_IMAGE_COMMAND:-}"
tag_image_command="${TAG_IMAGE_COMMAND:-}"
fi fi
# Deliberately word split load_image_command # Deliberately word split load_image_command
@ -472,6 +474,15 @@ function try-load-docker-image {
sleep 5 sleep 5
fi fi
done done
if [[ -n "${KUBE_ADDON_REGISTRY:-}" ]]; then
# remove the prefix and suffix from the path to get the container name
container=${img##*/}
container=${container%.tar}
# find the right one for which we will need an additional tag
container=$(ctr -n k8s.io images ls | grep "k8s.gcr.io/${container}" | awk '{print $1}' | cut -f 2 -d '/')
${tag_image_command} "k8s.gcr.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}"
fi
# Re-enable errexit. # Re-enable errexit.
set -e set -e
} }