mirror of https://github.com/kubernetes/kops.git
Update golang to 1.13.8
k/k is using 1.13.6, and it looks like there are some potentially relevant fixes in .7 and .8 (particularly on unpatched Windows).
This commit is contained in:
parent
d4c847cfe8
commit
b10f7a4252
2
Makefile
2
Makefile
|
@ -23,7 +23,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.13.4
|
GOVERSION=1.13.8
|
||||||
BUILD=$(KOPS_ROOT)/.build
|
BUILD=$(KOPS_ROOT)/.build
|
||||||
LOCAL=$(BUILD)/local
|
LOCAL=$(BUILD)/local
|
||||||
BINDATA_TARGETS=upup/models/bindata.go
|
BINDATA_TARGETS=upup/models/bindata.go
|
||||||
|
|
|
@ -7,10 +7,10 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "io_bazel_rules_go",
|
name = "io_bazel_rules_go",
|
||||||
urls = [
|
urls = [
|
||||||
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.20.2/rules_go-v0.20.2.tar.gz",
|
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.20.7/rules_go-v0.20.7.tar.gz",
|
||||||
"https://github.com/bazelbuild/rules_go/releases/download/v0.20.2/rules_go-v0.20.2.tar.gz",
|
"https://github.com/bazelbuild/rules_go/releases/download/v0.20.7/rules_go-v0.20.7.tar.gz",
|
||||||
],
|
],
|
||||||
sha256 = "b9aa86ec08a292b97ec4591cf578e020b35f98e12173bbd4a921f84f583aebd9",
|
sha256 = "62bedd372f125fe62c16c0cc2ad9d7a2b6a1171d639933a5651a729fdce497fc",
|
||||||
)
|
)
|
||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
|
@ -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.13.4",
|
go_version = "1.13.8",
|
||||||
)
|
)
|
||||||
|
|
||||||
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.13.4
|
ARG GO_VERSION=1.13.8
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
@ -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.13.4.linux-amd64.tar.gz | tar zx -C /usr/local
|
RUN curl -L https://storage.googleapis.com/golang/go1.13.8.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.13.4.linux-amd64.tar.gz | tar zx -C /usr/local
|
RUN curl -L https://storage.googleapis.com/golang/go1.13.8.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