Merge pull request #70665 from cblecker/go-1.11.2

Update to use go1.11.2

Merge pull request #70665 from cblecker/go-1.11.2
c2aa3586 · k8s-ci-robot · GitHub · f40a5d11 · b71e7462 · c2aa3586
Unverified Commit c2aa3586 authored Nov 06, 2018 by k8s-ci-robot Committed by GitHub Nov 06, 2018
Showing with 4 additions and 4 deletions

Dockerfile build/build-image/cross/Dockerfile +1 -1

VERSION build/build-image/cross/VERSION +1 -1

WORKSPACE build/root/WORKSPACE +1 -1

Makefile test/images/Makefile +1 -1

No files found.
--- 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 \

--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
-v1.11.1-2
+v1.11.2-1
--- 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()

--- 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