mirror of https://github.com/k3s-io/k3s
Bump golang version to 1.11.1
parent
0bde066cc1
commit
962fdbcbca
|
@ -15,7 +15,7 @@
|
|||
# This file creates a standard build environment for building cross
|
||||
# platform go binary for the architecture kubernetes cares about.
|
||||
|
||||
FROM golang:1.10.4
|
||||
FROM golang:1.11.1
|
||||
|
||||
ENV GOARM 7
|
||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||
|
|
|
@ -1 +1 @@
|
|||
v1.10.4-1
|
||||
v1.11.1-1
|
||||
|
|
|
@ -48,7 +48,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit
|
|||
go_rules_dependencies()
|
||||
|
||||
go_register_toolchains(
|
||||
go_version = "1.10.4",
|
||||
go_version = "1.11.1",
|
||||
)
|
||||
|
||||
docker_repositories()
|
||||
|
|
|
@ -360,7 +360,7 @@ EOF
|
|||
local go_version
|
||||
IFS=" " read -ra go_version <<< "$(go version)"
|
||||
local minimum_go_version
|
||||
minimum_go_version=go1.10.2
|
||||
minimum_go_version=go1.11.1
|
||||
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
|
||||
kube::log::usage_from_stdin <<EOF
|
||||
Detected go version: ${go_version[*]}.
|
||||
|
|
|
@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
|
|||
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
||||
GOARM=7
|
||||
QEMUVERSION=v2.9.1
|
||||
GOLANG_VERSION=1.10.4
|
||||
GOLANG_VERSION=1.11.1
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
|
Loading…
Reference in New Issue