Skip to content

Commit

Permalink
Merge pull request #3262 from mlgibbons/update-parsing-for-k8s-v1.11
Browse files Browse the repository at this point in the history
Add images and improve parsing for kubernetes 1.11
  • Loading branch information
tstromberg authored Jan 24, 2019
2 parents dc751c4 + a70d60a commit a130a09
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions pkg/minikube/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ func GetKubeadmCachedImages(kubernetesVersionStr string) []string {
"k8s.gcr.io/kube-apiserver-amd64:" + kubernetesVersionStr,
}

gt_v1_10 := semver.MustParseRange(">=1.11.0")
gt_v1_11 := semver.MustParseRange(">=1.12.0")
v1_11 := semver.MustParseRange(">=1.11.0 <1.12.0")
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")
Expand All @@ -229,7 +230,19 @@ func GetKubeadmCachedImages(kubernetesVersionStr string) []string {
glog.Errorln("Error parsing version semver: ", err)
}

if v1_10(kubernetesVersion) || gt_v1_10(kubernetesVersion) {
if v1_11(kubernetesVersion) || gt_v1_11(kubernetesVersion) {
images = append(images, []string{
"k8s.gcr.io/pause-amd64:3.1",
"k8s.gcr.io/pause: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.2.18",
"k8s.gcr.io/coredns:1.1.3",
"k8s.gcr.io/coredns:1.2.2",
}...)

} else 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",
Expand Down

0 comments on commit a130a09

Please sign in to comment.