From 438ff151d44d9beeaeae76b0492683692e66ca97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20P=C3=A9rez=20Hern=C3=A1ndez?= Date: Thu, 11 Jul 2019 12:17:42 -0700 Subject: [PATCH] cluster: configure: load images and add tags with no arch --- cluster/gce/gci/configure.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 1f768c3b50f..f7d3e1701ff 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -381,6 +381,15 @@ function load-docker-images { else try-load-docker-image "${img_dir}/kube-proxy.tar" fi + # When we load from a docker archive, the image is tagged with the arch, we don't have docker manifests here. + # The resource manifest is expecting something like 'registry/kube-controller-manager:v1.2.3', no arch specified. + local -r images=$(docker images --format "{{.Repository}}:{{.Tag}}" | egrep 'kube-apiserver|kube-controller-manager|kube-scheduler|kube-proxy' | grep amd64) + for image in $images ; do + local -r manifest_name="${image/-amd64/}" + if ! docker images --format "{{.Repository}}:{{.Tag}}" | grep -q ${manifest_name} ; then + docker tag $image $manifest_name + fi + done } # Downloads kubernetes binaries and kube-system manifest tarball, unpacks them,