Skip to content

Commit

Permalink
Merge pull request #3423 from kubernetes/revert-3402-v1.12.3
Browse files Browse the repository at this point in the history
Revert "Make k8s v1.12.3 the default"
  • Loading branch information
tstromberg authored Dec 6, 2018
2 parents e90390d + 2847622 commit c13a14f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ BUILDROOT_BRANCH ?= 2018.05
REGISTRY?=gcr.io/k8s-minikube

HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.10.x
# 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
BUILD_IMAGE ?= k8s.gcr.io/kube-cross:v1.10.1-1
ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image

ISO_VERSION ?= v0.30.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"path/filepath"
"runtime"
"strings"
"time"

"github.com/blang/semver"
"github.com/golang/glog"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/homedir"
minikubeVersion "k8s.io/minikube/pkg/version"
"time"
)

// APIServerPort is the port that the API server should listen on.
Expand Down Expand Up @@ -125,7 +125,7 @@ const (
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.10.0"

var ConfigFilePath = MakeMiniPath("config")
var ConfigFile = MakeMiniPath("config", "config.json")
Expand Down

0 comments on commit c13a14f

Please sign in to comment.