diff --git a/Makefile b/Makefile index c7ce225f13..604f20f8b4 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ RPM_VERSION ?= $(DEB_VERSION) RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below -GO_VERSION ?= 1.15.8 +GO_VERSION ?= 1.16.0 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2020.02.10 @@ -44,13 +44,7 @@ COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO COMMIT_SHORT = $(shell git rev-parse --short HEAD 2> /dev/null || true) HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.12.x -# NOTE: "latest" as of 2021-02-06. kube-cross images aren't updated as often as Kubernetes -# https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION -# -# TODO: See https://github.com/kubernetes/minikube/issues/10276 -#BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 -BUILD_IMAGE ?= golang:1.16.0-buster -# +BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)