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

Switch to golang 1.11.5 

For cherry-picking to 1.13

https://github.com/kubernetes/kubernetes/blob/release-1.13/build/build-image/cross/Dockerfile
This commit is contained in:
Justin SB 2019-04-20 06:24:09 -07:00
parent f41a95a10e
commit 1a575fe425
No known key found for this signature in database
GPG Key ID: 8DEC5C8217494E37
15 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -3,10 +3,10 @@ os:
- linux - linux
- osx - osx
go: go:
# 1.8 & 1.9 are now best-effort; we recommend 1.10; k8s apimachinery relies on 1.10 # 1.10 is now best-effort; we recommend 1.11; 1.12 is in the wild but not the k8s recommended version
# - 1.8 #- "1.10" gofmt changes mean this fails testing
# - 1.9 - "1.11"
- "1.10" - "1.12"
go_import_path: k8s.io/kops go_import_path: k8s.io/kops

2
Makefile
View File

@ -21,7 +21,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.10.8 GOVERSION=1.11.5
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

2
WORKSPACE
View File

@ -21,7 +21,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_to
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.10.8", go_version = "1.11.5",
) )
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

2
docker/Dockerfile
View File

@ -14,7 +14,7 @@
FROM alpine:3.8 FROM alpine:3.8
ARG GO_VERSION=1.10.8 ARG GO_VERSION=1.11.5
# KOPS_GITISH: Modify to build at an explicit tag/gitish # KOPS_GITISH: Modify to build at an explicit tag/gitish
ARG KOPS_GITISH=release ARG KOPS_GITISH=release

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.10.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.11.5.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.10.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.11.5.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