From 6f6e3a83995834f69c35df4f6e951d08d2d3afb0 Mon Sep 17 00:00:00 2001 From: Feilong Wang Date: Fri, 29 May 2020 14:15:03 +1200 Subject: [PATCH] Use full name for hyperkube image inspect Task: 39898 Story: 2007001 Change-Id: I648333ba7c4e818f500a82b20d09403a45cca724 (cherry picked from commit 4b5018388ca04e672a5ba414543eb835eb094e59) --- .../templates/kubernetes/fragments/enable-services-master.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh index a1f77d9aec..679441d9ac 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh @@ -38,7 +38,7 @@ do done if [ "$(echo $USE_PODMAN | tr '[:upper:]' '[:lower:]')" == "true" ]; then - KUBE_DIGEST=$($ssh_cmd podman image inspect hyperkube:${KUBE_TAG} --format "{{.Digest}}") + KUBE_DIGEST=$($ssh_cmd podman image inspect ${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:${KUBE_TAG} --format "{{.Digest}}") if [ -n "${KUBE_IMAGE_DIGEST}" ] && [ "${KUBE_IMAGE_DIGEST}" != "${KUBE_DIGEST}" ]; then printf "The sha256 ${KUBE_DIGEST} of current hyperkube image cannot match the given one: ${KUBE_IMAGE_DIGEST}." exit 1