From fd7e0f13e324321eef3fc211f43d6114438b8304 Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Thu, 28 Dec 2017 19:13:40 -0700 Subject: [PATCH 1/2] Updating make to use golang 1.9.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0172383215..9e5646db2c 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%) LATEST_FILE?=latest-ci.txt GOPATH_1ST=$(shell go env | grep GOPATH | cut -f 2 -d \") UNIQUE:=$(shell date +%s) -GOVERSION=1.8.3 +GOVERSION=1.9.2 BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build LOCAL=$(BUILD)/local BINDATA_TARGETS=upup/models/bindata.go federation/model/bindata.go From 1dc4f779a07ebbdfbd96a134303326a9f00e3d8f Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Thu, 28 Dec 2017 19:19:34 -0700 Subject: [PATCH 2/2] updating protokube and dnscontroller builds to use golang 1.9.2 --- images/dns-controller-builder/Dockerfile | 2 +- images/protokube-builder/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/dns-controller-builder/Dockerfile b/images/dns-controller-builder/Dockerfile index 0885649618..51c7bb88ea 100644 --- a/images/dns-controller-builder/Dockerfile +++ b/images/dns-controller-builder/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \ && rm -rf /var/lib/apt/lists/* # Install golang -RUN curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar zx -C /usr/local +RUN curl -L https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz | tar zx -C /usr/local ENV PATH $PATH:/usr/local/go/bin COPY onbuild.sh /onbuild.sh diff --git a/images/protokube-builder/Dockerfile b/images/protokube-builder/Dockerfile index 0885649618..51c7bb88ea 100644 --- a/images/protokube-builder/Dockerfile +++ b/images/protokube-builder/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \ && rm -rf /var/lib/apt/lists/* # Install golang -RUN curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar zx -C /usr/local +RUN curl -L https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz | tar zx -C /usr/local ENV PATH $PATH:/usr/local/go/bin COPY onbuild.sh /onbuild.sh