From 48cb28b7cc92acbdb205c8322b21d9eada62050d Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Tue, 2 Mar 2021 14:17:43 -0800 Subject: [PATCH] separate kube-cross version from GO_VERSION --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a1cfd27149..379eb7bda1 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,8 @@ 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.16.0 +GO_VERSION ?= 1.15.8 +KUBE_CROSS_VERSION ?= 1.16.0-1 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2020.02.10 @@ -47,7 +48,7 @@ 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 # -BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(GO_VERSION)-1 +BUILD_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v$(KUBE_CROSS_VERSION) ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image KVM_BUILD_IMAGE ?= $(REGISTRY)/kvm-build-image:$(GO_VERSION)