From a6f86c67782443a54bfca6eecdf4a46cc7388bbb Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 6 Jul 2018 15:18:43 -0400 Subject: [PATCH] pause image should be arch agnostic Change-Id: I4997ace30077335767bca402a8b98202c91b950b Signed-off-by: Davanum Srinivas --- cmd/kubeadm/app/images/images.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go index 3fa53b613e8..0b700a539eb 100644 --- a/cmd/kubeadm/app/images/images.go +++ b/cmd/kubeadm/app/images/images.go @@ -26,6 +26,11 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) +// GetGenericImage generates and returns a platform agnostic image (backed by manifest list) +func GetGenericImage(prefix, image, tag string) string { + return fmt.Sprintf("%s/%s:%s", prefix, image, tag) +} + // GetGenericArchImage generates and returns an image based on the current runtime arch func GetGenericArchImage(prefix, image, tag string) string { return fmt.Sprintf("%s/%s-%s:%s", prefix, image, runtime.GOARCH, tag) @@ -68,7 +73,7 @@ func GetAllImages(cfg *kubeadmapi.MasterConfiguration) []string { imgs = append(imgs, GetKubeControlPlaneImageNoOverride(constants.KubeProxy, cfg)) // pause, etcd and kube-dns are not available on the ci image repository so use the default image repository. - imgs = append(imgs, GetGenericArchImage(cfg.ImageRepository, "pause", "3.1")) + imgs = append(imgs, GetGenericImage(cfg.ImageRepository, "pause", "3.1")) // if etcd is not external then add the image as it will be required if cfg.Etcd.Local != nil {