github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Update to go1.10.2

Browse Source
This commit is contained in:
Mark Janssen 2018-05-04 00:39:21 +02:00
parent 2f694e8fa1
commit ac731ed2e5
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Dockerfile
View File

@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.10.1 FROM golang:1.10.2
ENV GOARM 7 ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.10.1-1 v1.10.2-1

6
build/root/WORKSPACE
View File

@ -2,8 +2,8 @@ load("//build:workspace_mirror.bzl", "mirror")
http_archive( http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
sha256 = "4b2c61795ac2eefcb28f3eb8e1cb2d8fb3c2eafa0f6712473bc5f93728f38758", sha256 = "6c770aece75ac47fe218ad881775c37cf29db013ab751d0bfef01c0b5a6ee01f",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.2/rules_go-0.10.2.tar.gz"), urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.4/rules_go-0.10.4.tar.gz"),
) )
http_archive( http_archive(
@ -47,7 +47,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.10.1", go_version = "1.10.2",
) )
docker_repositories() docker_repositories()

2
hack/lib/golang.sh
View File

@ -321,7 +321,7 @@ EOF
local go_version local go_version
IFS=" " read -ra go_version <<< "$(go version)" IFS=" " read -ra go_version <<< "$(go version)"
local minimum_go_version local minimum_go_version
minimum_go_version=go1.10.1 minimum_go_version=go1.10.2
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 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 kube::log::usage_from_stdin <<EOF
Detected go version: ${go_version[*]}. Detected go version: ${go_version[*]}.

2
test/images/Makefile
View File

@ -15,7 +15,7 @@
REGISTRY ?= gcr.io/kubernetes-e2e-test-images REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM=7 GOARM=7
QEMUVERSION=v2.9.1 QEMUVERSION=v2.9.1
GOLANG_VERSION=1.10.1 GOLANG_VERSION=1.10.2
export export
ifndef WHAT ifndef WHAT