mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #108712 from dims/support-ci-jobs-that-use-prebuilt-images-by-adding-additional-image-tags
Support CI jobs that use prebuilt-images by adding additional image tags
This commit is contained in:
commit
1007f4974d
@ -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
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user