From a37b01e57c98efc1297bd90ef5c66892ea4953d9 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Fri, 25 Jan 2019 12:01:11 -0800
Subject: [PATCH] Update to go1.10.8

---
 build/build-image/cross/Dockerfile      | 2 +-
 build/build-image/cross/VERSION         | 2 +-
 build/root/WORKSPACE                    | 6 +++---
 test/images/Makefile                    | 2 +-
 test/images/sample-apiserver/Dockerfile | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index ce22cf595611a..45aad9d6189f6 100644
--- 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.7
+FROM golang:1.10.8
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index b69e4fdb0064f..4432a8923a144 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.10.7-1
+v1.10.8-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 1d7b59e501274..2188540bc4cc7 100644
--- 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 = "e04c06defc6d6e7fc05757c9aa9d4461823d96498c1b2757ef71ae2f665bfb99",
-    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.15.10/rules_go-0.15.10.tar.gz"),
+    sha256 = "7b7c74740e3a757204ddb93241ce728906af795d6c6aa0950e0e640716dc1e4a",
+    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.15.11/rules_go-0.15.11.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.10.7",
+    go_version = "1.10.8",
 )
 
 docker_repositories()
diff --git a/test/images/Makefile b/test/images/Makefile
index cb359df4f289d..fa4ed3e380c0f 100644
--- 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.10.7
+GOLANG_VERSION=1.10.8
 export
 
 ifndef WHAT
diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile
index cdf11d742e92d..6252acc09452f 100644
--- a/test/images/sample-apiserver/Dockerfile
+++ b/test/images/sample-apiserver/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM k8s.gcr.io/kube-cross:v1.10.7-1 as build_k8s_1_7_sample_apiserver
+FROM k8s.gcr.io/kube-cross:v1.10.8-1 as build_k8s_1_7_sample_apiserver
 
 ENV GOPATH /go
 RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin