Merge pull request kubernetes#70665 from cblecker/go-1.11.2

Update to use go1.11.2
MIBc · Nov 6, 2018 · c2aa358 · c2aa358
2 parents f40a5d1 + b71e746
commit c2aa358
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 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.11.1
+FROM golang:1.11.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.11.1-2
+v1.11.2-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
@@ -49,7 +49,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.11.1",
+    go_version = "1.11.2",
 )
 
 docker_repositories()

diff --git a/test/images/Makefile b/test/images/Makefile
@@ -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.11.1
+GOLANG_VERSION=1.11.2
 export
 
 ifndef WHAT