kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update golang version to 1.10.3, for k8s 1.11 

k8s 1.11 is tested when built with go 1.10.3
This commit is contained in:
Justin Santa Barbara 2018-09-22 02:59:13 -04:00
parent 666e290983
commit 93f1e26f57
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -20,7 +20,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt LATEST_FILE?=latest-ci.txt
GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \") GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \")
UNIQUE:=$(shell date +%s) UNIQUE:=$(shell date +%s)
GOVERSION=1.9.3 GOVERSION=1.10.3
BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build
LOCAL=$(BUILD)/local LOCAL=$(BUILD)/local
BINDATA_TARGETS=upup/models/bindata.go BINDATA_TARGETS=upup/models/bindata.go
@ -198,7 +198,7 @@ upup/models/bindata.go: ${GOBINDATA} ${UPUP_MODELS_BINDATA_SOURCES}
# Build in a docker container with golang 1.X # Build in a docker container with golang 1.X
# Used to test we have not broken 1.X # Used to test we have not broken 1.X
# 1.9 is preferred, 1.10 is likely to be the default soon. 1.8 is best-effort # 1.10 is the default for k8s 1.11. Others are best-effort
.PHONY: check-builds-in-go18 .PHONY: check-builds-in-go18
check-builds-in-go18: check-builds-in-go18:
# Note we only check that kops builds; we know the tests don't compile because of type aliasing in uber zap # Note we only check that kops builds; we know the tests don't compile because of type aliasing in uber zap

2
WORKSPACE
View File

@ -18,7 +18,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_too
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.9.3", go_version = "1.10.3",
) )
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

2
images/dns-controller-builder/Dockerfile
View File

@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.9.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.10.3.linux-amd64.tar.gz | tar zx -C /usr/local
ENV PATH $PATH:/usr/local/go/bin ENV PATH $PATH:/usr/local/go/bin
COPY onbuild.sh /onbuild.sh COPY onbuild.sh /onbuild.sh

2
images/protokube-builder/Dockerfile
View File

@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.9.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.10.3.linux-amd64.tar.gz | tar zx -C /usr/local
ENV PATH $PATH:/usr/local/go/bin ENV PATH $PATH:/usr/local/go/bin
COPY onbuild.sh /onbuild.sh COPY onbuild.sh /onbuild.sh