mirror of https://github.com/kubernetes/kops.git
Upgrade go to 1.13
This commit is contained in:
parent
51bde64325
commit
024c8a92d7
|
@ -3,10 +3,10 @@ os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
go:
|
go:
|
||||||
# 1.10 & 1.11 are now best-effort; we recommend 1.12
|
# 1.11 & 1.12 are now best-effort; we recommend 1.13
|
||||||
# - "1.10" gofmt changes mean 1.10 fails testing
|
|
||||||
- "1.11"
|
- "1.11"
|
||||||
- "1.12"
|
- "1.12"
|
||||||
|
- "1.13"
|
||||||
|
|
||||||
go_import_path: k8s.io/kops
|
go_import_path: k8s.io/kops
|
||||||
|
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -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.12.11
|
GOVERSION=1.13.4
|
||||||
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
|
||||||
|
|
|
@ -27,7 +27,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
|
||||||
go_rules_dependencies()
|
go_rules_dependencies()
|
||||||
|
|
||||||
go_register_toolchains(
|
go_register_toolchains(
|
||||||
go_version = "1.12.11",
|
go_version = "1.13.4",
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
|
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
FROM alpine:3.8
|
FROM alpine:3.8
|
||||||
|
|
||||||
ARG GO_VERSION=1.12.11
|
ARG GO_VERSION=1.13.4
|
||||||
|
|
||||||
# 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
go.mod
2
go.mod
|
@ -1,6 +1,6 @@
|
||||||
module k8s.io/kops
|
module k8s.io/kops
|
||||||
|
|
||||||
go 1.12
|
go 1.13
|
||||||
|
|
||||||
// Version kubernetes-1.15.3
|
// Version kubernetes-1.15.3
|
||||||
//replace k8s.io/kubernetes => k8s.io/kubernetes v1.15.3
|
//replace k8s.io/kubernetes => k8s.io/kubernetes v1.15.3
|
||||||
|
|
|
@ -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.12.11.linux-amd64.tar.gz | tar zx -C /usr/local
|
RUN curl -L https://storage.googleapis.com/golang/go1.13.4.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
|
||||||
|
|
|
@ -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.12.11.linux-amd64.tar.gz | tar zx -C /usr/local
|
RUN curl -L https://storage.googleapis.com/golang/go1.13.4.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
|
||||||
|
|
Loading…
Reference in New Issue