kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update code to cache correct images for different k8s versions

pull/2873/head
Mark Gibbons 2018-05-27 08:00:21 +01:00 committed by dlorenc
parent 6cc9a85f68
commit 376380e74e
1 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
pkg/minikube/constants/constants.go
View File

@ -20,7 +20,10 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"github.com/blang/semver"
"github.com/golang/glog"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/homedir" "k8s.io/client-go/util/homedir"
"k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version"
@ -215,33 +218,68 @@ var LocalkubeCachedImages = []string{
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0", "gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
} }
func GetKubeadmCachedImages(version string) []string { func GetKubeadmCachedImages(kubernetesVersionStr string) []string {
return []string{
// Dashboard
"k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1",
// Addon Manager var images = []string{
"k8s.gcr.io/kube-addon-manager:v8.6", "k8s.gcr.io/kube-proxy-amd64:" + kubernetesVersionStr,
"k8s.gcr.io/kube-scheduler-amd64:" + kubernetesVersionStr,
// Pause "k8s.gcr.io/kube-controller-manager-amd64:" + kubernetesVersionStr,
"k8s.gcr.io/pause-amd64:3.1", "k8s.gcr.io/kube-apiserver-amd64:" + kubernetesVersionStr,
// DNS
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.8",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8",
// etcd
"k8s.gcr.io/etcd-amd64:3.1.12",
"k8s.gcr.io/kube-proxy-amd64:" + version,
"k8s.gcr.io/kube-scheduler-amd64:" + version,
"k8s.gcr.io/kube-controller-manager-amd64:" + version,
"k8s.gcr.io/kube-apiserver-amd64:" + version,
//Storage Provisioner
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
} }
v1_10, _ := semver.ParseRange(">=1.10.0 <1.11.0")
v1_9, _ := semver.ParseRange(">=1.9.0 <1.10.0")
v1_8, _ := semver.ParseRange(">=1.8.0 <1.9.0")
kubernetesVersion, err := semver.Make(strings.TrimPrefix(kubernetesVersionStr, minikubeVersion.VersionPrefix))
if err != nil {
glog.Errorln("Error parsing version semver: ", err)
}
if v1_10(kubernetesVersion) {
images = append(images, []string{
"k8s.gcr.io/pause-amd64:3.1",
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.8",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8",
"k8s.gcr.io/etcd-amd64:3.1.12",
}...)
} else if v1_9(kubernetesVersion) {
images = append(images, []string{
"k8s.gcr.io/pause-amd64:3.0",
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.7",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.7",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.7",
"k8s.gcr.io/etcd-amd64:3.1.10",
}...)
} else if v1_8(kubernetesVersion) {
images = append(images, []string{
"k8s.gcr.io/pause-amd64:3.0",
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5",
"k8s.gcr.io/etcd-amd64:3.0.17",
}...)
} else {
images = append(images, []string{
"k8s.gcr.io/pause-amd64:3.1",
"k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.8",
"k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.8",
"k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8",
"k8s.gcr.io/etcd-amd64:3.1.12",
}...)
}
images = append(images, []string{
"k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1",
"k8s.gcr.io/kube-addon-manager:v8.6",
"gcr.io/k8s-minikube/storage-provisioner:v1.8.1",
}...)
return images
} }
var ImageCacheDir = MakeMiniPath("cache", "images") var ImageCacheDir = MakeMiniPath("cache", "images")