Update to go1.10.2

based64god · May 3, 2018 · ac731ed · ac731ed
1 parent 2f694e8
commit ac731ed
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
@@ -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.1
+FROM golang:1.10.2
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \

diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.10.1-1
+v1.10.2-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
@@ -2,8 +2,8 @@ load("//build:workspace_mirror.bzl", "mirror")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "4b2c61795ac2eefcb28f3eb8e1cb2d8fb3c2eafa0f6712473bc5f93728f38758",
-    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.2/rules_go-0.10.2.tar.gz"),
+    sha256 = "6c770aece75ac47fe218ad881775c37cf29db013ab751d0bfef01c0b5a6ee01f",
+    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.4/rules_go-0.10.4.tar.gz"),
 )
 
 http_archive(
@@ -47,7 +47,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.10.1",
+    go_version = "1.10.2",
 )
 
 docker_repositories()

diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
@@ -321,7 +321,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(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
     kube::log::usage_from_stdin <<EOF
 Detected go version: ${go_version[*]}.

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