From 9690d44fca95e6defa4f92c017db3ca65a3b047d Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Fri, 30 Mar 2018 15:26:18 -0700
Subject: [PATCH] Update to use go1.10.1

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

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index 423e1d634d..ef5b3496d0 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.9.3
+FROM golang:1.10.1
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index 034db155c0..d7fd49aa41 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.9.3-2
+v1.10.1-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 3d9a87c6c0..b01c00ee32 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -1,8 +1,7 @@
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "66282d078c1847c2d876c02c5dabd4fd57cc75eb41a9668a2374352fa73b4587",
-    strip_prefix = "rules_go-ff7e3364d9383cf14155f8c2efc87218d07eb03b",
-    urls = ["https://github.com/bazelbuild/rules_go/archive/ff7e3364d9383cf14155f8c2efc87218d07eb03b.tar.gz"],
+    sha256 = "4b2c61795ac2eefcb28f3eb8e1cb2d8fb3c2eafa0f6712473bc5f93728f38758",
+    urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.10.2/rules_go-0.10.2.tar.gz"],
 )
 
 http_archive(
@@ -46,7 +45,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.9.3",
+    go_version = "1.10.1",
 )
 
 docker_repositories()
diff --git a/test/images/Makefile b/test/images/Makefile
index bbb15fb80d..af4bce7291 100644
--- 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.9.3
+GOLANG_VERSION=1.10.1
 export
 
 ifndef WHAT