From ef39ac370598a29af71b8c93975afdffffc89d2b Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Tue, 24 Oct 2017 09:28:57 -0700 Subject: [PATCH 1/2] upgrade to go 1.9 --- .travis.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcd451ad001f..e9051e8ea964 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ os: linux sudo: required go: - - 1.8.3 + - 1.9 go_import_path: k8s.io/minikube install: diff --git a/Makefile b/Makefile index 894e9ae0a65b..11fbcf17e5e1 100755 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2017.02 REGISTRY?=gcr.io/k8s-minikube -HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.8.3 -BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.8.3-1 +HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.9 +BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.9 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image ISO_VERSION ?= v0.23.6 From 404a043bf6519d1750eaa34e76ebc08f42e2b846 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Tue, 24 Oct 2017 10:18:25 -0700 Subject: [PATCH 2/2] updated build image --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 11fbcf17e5e1..6247cbe9d113 100755 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2017.02 REGISTRY?=gcr.io/k8s-minikube -HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.9 -BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.9 +HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.8.3 +BUILD_IMAGE ?= gcr.io/google_containers/kube-cross:v1.9.1-1 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image ISO_VERSION ?= v0.23.6