Skip to content

Commit 2a32858

Browse files
tstrombergtstromberg
authored
Merge pull request #3942 from laozc/image-name
Remove arch suffixes in image names
2 parents 49f1f0a + a143711 commit 2a32858

File tree

2 files changed

+29
-22
lines changed

2 files changed

+29
-22
lines changed

‎pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Wants=docker.socket
8686
8787
[Service]
8888
ExecStart=
89-
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
89+
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
9090
9191
[Install]
9292
`,

‎pkg/minikube/constants/constants.go

+28-21
Original file line numberDiff line numberDiff line change
@@ -238,32 +238,42 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
238238
minikubeRepository += "/"
239239
}
240240

241-
var images = []string{
242-
imageRepository + "kube-proxy-amd64:" + kubernetesVersionStr,
243-
imageRepository + "kube-scheduler-amd64:" + kubernetesVersionStr,
244-
imageRepository + "kube-controller-manager-amd64:" + kubernetesVersionStr,
245-
imageRepository + "kube-apiserver-amd64:" + kubernetesVersionStr,
246-
}
247-
248241
v1_14plus := semver.MustParseRange(">=1.14.0")
249242
v1_13 := semver.MustParseRange(">=1.13.0 <1.14.0")
250243
v1_12 := semver.MustParseRange(">=1.12.0 <1.13.0")
251244
v1_11 := semver.MustParseRange(">=1.11.0 <1.12.0")
252245
v1_10 := semver.MustParseRange(">=1.10.0 <1.11.0")
253246
v1_9 := semver.MustParseRange(">=1.9.0 <1.10.0")
254247
v1_8 := semver.MustParseRange(">=1.8.0 <1.9.0")
248+
v1_12plus := semver.MustParseRange(">=1.12.0")
255249

256250
kubernetesVersion, err := semver.Make(strings.TrimPrefix(kubernetesVersionStr, minikubeVersion.VersionPrefix))
257251
if err != nil {
258252
glog.Errorln("Error parsing version semver: ", err)
259253
}
260254

255+
var images []string
256+
if v1_12plus(kubernetesVersion) {
257+
images = append(images, []string{
258+
imageRepository + "kube-proxy:" + kubernetesVersionStr,
259+
imageRepository + "kube-scheduler:" + kubernetesVersionStr,
260+
imageRepository + "kube-controller-manager:" + kubernetesVersionStr,
261+
imageRepository + "kube-apiserver:" + kubernetesVersionStr,
262+
}...)
263+
} else {
264+
images = append(images, []string{
265+
imageRepository + "kube-proxy-amd64:" + kubernetesVersionStr,
266+
imageRepository + "kube-scheduler-amd64:" + kubernetesVersionStr,
267+
imageRepository + "kube-controller-manager-amd64:" + kubernetesVersionStr,
268+
imageRepository + "kube-apiserver-amd64:" + kubernetesVersionStr,
269+
}...)
270+
}
271+
261272
var podInfraContainerImage string
262273
if v1_14plus(kubernetesVersion) {
263-
podInfraContainerImage = imageRepository + "pause-amd64:3.1"
274+
podInfraContainerImage = imageRepository + "pause:3.1"
264275
images = append(images, []string{
265276
podInfraContainerImage,
266-
imageRepository + "pause:3.1",
267277
imageRepository + "k8s-dns-kube-dns-amd64:1.14.13",
268278
imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.13",
269279
imageRepository + "k8s-dns-sidecar-amd64:1.14.13",
@@ -272,34 +282,31 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
272282
}...)
273283

274284
} else if v1_13(kubernetesVersion) {
275-
podInfraContainerImage = imageRepository + "pause-amd64:3.1"
285+
podInfraContainerImage = imageRepository + "pause:3.1"
276286
images = append(images, []string{
277287
podInfraContainerImage,
278-
imageRepository + "pause:3.1",
279288
imageRepository + "k8s-dns-kube-dns-amd64:1.14.8",
280289
imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.8",
281290
imageRepository + "k8s-dns-sidecar-amd64:1.14.8",
282-
imageRepository + "etcd-amd64:3.2.24",
291+
imageRepository + "etcd:3.2.24",
283292
imageRepository + "coredns:1.2.6",
284293
}...)
285294

286295
} else if v1_12(kubernetesVersion) {
287-
podInfraContainerImage = imageRepository + "pause-amd64:3.1"
296+
podInfraContainerImage = imageRepository + "pause:3.1"
288297
images = append(images, []string{
289298
podInfraContainerImage,
290-
imageRepository + "pause:3.1",
291299
imageRepository + "k8s-dns-kube-dns-amd64:1.14.8",
292300
imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.8",
293301
imageRepository + "k8s-dns-sidecar-amd64:1.14.8",
294-
imageRepository + "etcd-amd64:3.2.24",
302+
imageRepository + "etcd:3.2.24",
295303
imageRepository + "coredns:1.2.2",
296304
}...)
297305

298306
} else if v1_11(kubernetesVersion) {
299-
podInfraContainerImage = imageRepository + "pause-amd64:3.1"
307+
podInfraContainerImage = imageRepository + "pause:3.1"
300308
images = append(images, []string{
301309
podInfraContainerImage,
302-
imageRepository + "pause:3.1",
303310
imageRepository + "k8s-dns-kube-dns-amd64:1.14.8",
304311
imageRepository + "k8s-dns-dnsmasq-nanny-amd64:1.14.8",
305312
imageRepository + "k8s-dns-sidecar-amd64:1.14.8",
@@ -308,7 +315,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
308315
}...)
309316

310317
} else if v1_10(kubernetesVersion) {
311-
podInfraContainerImage = imageRepository + "pause-amd64:3.1"
318+
podInfraContainerImage = imageRepository + "pause:3.1"
312319
images = append(images, []string{
313320
podInfraContainerImage,
314321
imageRepository + "k8s-dns-kube-dns-amd64:1.14.8",
@@ -318,7 +325,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
318325
}...)
319326

320327
} else if v1_9(kubernetesVersion) {
321-
podInfraContainerImage = imageRepository + "pause-amd64:3.0"
328+
podInfraContainerImage = imageRepository + "pause:3.0"
322329
images = append(images, []string{
323330
podInfraContainerImage,
324331
imageRepository + "k8s-dns-kube-dns-amd64:1.14.7",
@@ -328,7 +335,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
328335
}...)
329336

330337
} else if v1_8(kubernetesVersion) {
331-
podInfraContainerImage = imageRepository + "pause-amd64:3.0"
338+
podInfraContainerImage = imageRepository + "pause:3.0"
332339
images = append(images, []string{
333340
podInfraContainerImage,
334341
imageRepository + "k8s-dns-kube-dns-amd64:1.14.5",
@@ -338,7 +345,7 @@ func GetKubeadmCachedImages(imageRepository string, kubernetesVersionStr string)
338345
}...)
339346

340347
} else {
341-
podInfraContainerImage = imageRepository + "/pause-amd64:3.0"
348+
podInfraContainerImage = imageRepository + "pause:3.0"
342349
}
343350

344351
images = append(images, []string{

0 commit comments

Comments
 (0)