From dfb04221e9a048e979fec494dfbf174a044feae9 Mon Sep 17 00:00:00 2001 From: Zhongcheng Lao Date: Fri, 22 Mar 2019 23:41:31 +0800 Subject: [PATCH] Remove arch suffixes in image names Removing arch suffixes in image names to make sure image caching work with kubeadm since 1.12.0. Signed-off-by: Zhongcheng Lao --- .../bootstrapper/kubeadm/kubeadm_test.go | 2 +- pkg/minikube/constants/constants.go | 49 +++++++++++-------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 7f780f9e8aba..71a35fb8eb79 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -86,7 +86,7 @@ Wants=docker.socket [Service] ExecStart= -ExecStart=/usr/bin/kubelet --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=docker --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-infra-container-image=docker-proxy-image.io/google_containers//pause-amd64:3.0 --pod-manifest-path=/etc/kubernetes/manifests --require-kubeconfig=true +ExecStart=/usr/bin/kubelet --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=docker --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-infra-container-image=docker-proxy-image.io/google_containers//pause:3.0 --pod-manifest-path=/etc/kubernetes/manifests --require-kubeconfig=true [Install] `, diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 3972ea318ebf..5e3ef0372fdb 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -238,13 +238,6 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) minikubeRepository += "/" } - var images = []string{ - imageRepository + "kube-proxy-amd64:" + kubernetesVersionStr, - imageRepository + "kube-scheduler-amd64:" + kubernetesVersionStr, - imageRepository + "kube-controller-manager-amd64:" + kubernetesVersionStr, - imageRepository + "kube-apiserver-amd64:" + kubernetesVersionStr, - } - ge_v1_14 := semver.MustParseRange(">=1.14.0") v1_13 := semver.MustParseRange(">=1.13.0 <1.14.0") v1_12 := semver.MustParseRange(">=1.12.0 <1.13.0") @@ -252,18 +245,35 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) v1_10 := semver.MustParseRange(">=1.10.0 <1.11.0") v1_9 := semver.MustParseRange(">=1.9.0 <1.10.0") v1_8 := semver.MustParseRange(">=1.8.0 <1.9.0") + ge_v1_12 := semver.MustParseRange(">=1.12.0") kubernetesVersion, err := semver.Make(strings.TrimPrefix(kubernetesVersionStr, minikubeVersion.VersionPrefix)) if err != nil { glog.Errorln("Error parsing version semver: ", err) } + var images []string + if ge_v1_12(kubernetesVersion) { + images = append(images, []string{ + imageRepository + "kube-proxy:" + kubernetesVersionStr, + imageRepository + "kube-scheduler:" + kubernetesVersionStr, + imageRepository + "kube-controller-manager:" + kubernetesVersionStr, + imageRepository + "kube-apiserver:" + kubernetesVersionStr, + }...) + } else { + images = append(images, []string{ + imageRepository + "kube-proxy-amd64:" + kubernetesVersionStr, + imageRepository + "kube-scheduler-amd64:" + kubernetesVersionStr, + imageRepository + "kube-controller-manager-amd64:" + kubernetesVersionStr, + imageRepository + "kube-apiserver-amd64:" + kubernetesVersionStr, + }...) + } + var podInfraContainerImage string if ge_v1_14(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.1" + podInfraContainerImage = imageRepository + "pause:3.1" images = append(images, []string{ podInfraContainerImage, - imageRepository + "pause:3.1", imageRepository + "k8s-dns-kube-dns-amd64:1.14.13", imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.13", imageRepository + "k8s-dns-sidecar-amd64:1.14.13", @@ -272,34 +282,31 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) }...) } else if v1_13(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.1" + podInfraContainerImage = imageRepository + "pause:3.1" images = append(images, []string{ podInfraContainerImage, - imageRepository + "pause:3.1", imageRepository + "k8s-dns-kube-dns-amd64:1.14.8", imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.8", imageRepository + "k8s-dns-sidecar-amd64:1.14.8", - imageRepository + "etcd-amd64:3.2.24", + imageRepository + "etcd:3.2.24", imageRepository + "coredns:1.2.6", }...) } else if v1_12(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.1" + podInfraContainerImage = imageRepository + "pause:3.1" images = append(images, []string{ podInfraContainerImage, - imageRepository + "pause:3.1", imageRepository + "k8s-dns-kube-dns-amd64:1.14.8", imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.8", imageRepository + "k8s-dns-sidecar-amd64:1.14.8", - imageRepository + "etcd-amd64:3.2.24", + imageRepository + "etcd:3.2.24", imageRepository + "coredns:1.2.2", }...) } else if v1_11(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.1" + podInfraContainerImage = imageRepository + "pause:3.1" images = append(images, []string{ podInfraContainerImage, - imageRepository + "pause:3.1", imageRepository + "k8s-dns-kube-dns-amd64:1.14.8", imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.8", imageRepository + "k8s-dns-sidecar-amd64:1.14.8", @@ -308,7 +315,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) }...) } else if v1_10(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.1" + podInfraContainerImage = imageRepository + "pause:3.1" images = append(images, []string{ podInfraContainerImage, imageRepository + "k8s-dns-kube-dns-amd64:1.14.8", @@ -318,7 +325,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) }...) } else if v1_9(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.0" + podInfraContainerImage = imageRepository + "pause:3.0" images = append(images, []string{ podInfraContainerImage, imageRepository + "k8s-dns-kube-dns-amd64:1.14.7", @@ -328,7 +335,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) }...) } else if v1_8(kubernetesVersion) { - podInfraContainerImage = imageRepository + "pause-amd64:3.0" + podInfraContainerImage = imageRepository + "pause:3.0" images = append(images, []string{ podInfraContainerImage, imageRepository + "k8s-dns-kube-dns-amd64:1.14.5", @@ -338,7 +345,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string) }...) } else { - podInfraContainerImage = imageRepository + "/pause-amd64:3.0" + podInfraContainerImage = imageRepository + "pause:3.0" } images = append(images, []string{