From e12550d323d70973824bb98e508eefd41fb47913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= Date: Fri, 14 Dec 2018 14:47:27 -0800 Subject: [PATCH 1/2] Revert "Revert "Make k8s v1.12.3 the default"" --- Makefile | 3 ++- pkg/minikube/constants/constants.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 51b36aeb3ec4..25f87b67c8c2 100755 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ BUILDROOT_BRANCH ?= 2018.05 REGISTRY?=gcr.io/k8s-minikube HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.10.x -BUILD_IMAGE ?= k8s.gcr.io/kube-cross:v1.10.1-1 +# NOTE: "latest" as of 2018-12-04. kube-cross images aren't updated as often as Kubernetes +BUILD_IMAGE ?= k8s.gcr.io/kube-cross:v1.11.1-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image ISO_VERSION ?= v0.31.0 diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 6f917cfdbba4..fa02e6aa13cc 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -127,7 +127,7 @@ kubectl: {{.Kubeconfig}}` var DefaultIsoUrl = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", minikubeVersion.GetIsoPath(), minikubeVersion.GetIsoVersion()) var DefaultIsoShaUrl = DefaultIsoUrl + ShaSuffix -var DefaultKubernetesVersion = "v1.10.0" +var DefaultKubernetesVersion = "v1.12.3" var ConfigFilePath = MakeMiniPath("config") var ConfigFile = MakeMiniPath("config", "config.json") From d9487db34a17208703ed0447a7360abe5d571227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Str=C3=B6mberg?= Date: Fri, 21 Dec 2018 11:20:04 -0800 Subject: [PATCH 2/2] Update constants.go --- pkg/minikube/constants/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index fa02e6aa13cc..4cd8cd686dcc 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -127,7 +127,7 @@ kubectl: {{.Kubeconfig}}` var DefaultIsoUrl = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", minikubeVersion.GetIsoPath(), minikubeVersion.GetIsoVersion()) var DefaultIsoShaUrl = DefaultIsoUrl + ShaSuffix -var DefaultKubernetesVersion = "v1.12.3" +var DefaultKubernetesVersion = "v1.12.4" var ConfigFilePath = MakeMiniPath("config") var ConfigFile = MakeMiniPath("config", "config.json")