Merge pull request #73376 from cblecker/automated-cherry-pick-of-#733…

…26-upstream-release-1.13 Automated cherry pick of #73326: Update to go1.11.5
kubernetes · Jan 30, 2019 · 6a4baf6 · 6a4baf6
2 parents 323d17c + 3c58fb1
commit 6a4baf6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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.4
+FROM golang:1.11.5
 
 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.4-1
+v1.11.5-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
@@ -4,8 +4,8 @@ load("//build:workspace.bzl", "CRI_TOOLS_VERSION")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "7be7dc01f1e0afdba6c8eb2b43d2fa01c743be1b9273ab1eaf6c233df078d705",
-    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.16.5/rules_go-0.16.5.tar.gz"),
+    sha256 = "ade51a315fa17347e5c31201fdc55aa5ffb913377aa315dceb56ee9725e620ee",
+    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.16.6/rules_go-0.16.6.tar.gz"),
 )
 
 http_archive(
@@ -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.4",
+    go_version = "1.11.5",
 )
 
 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.4
+GOLANG_VERSION=1.11.5
 export
 
 ifndef WHAT