From 5c026f6317e1351b069dc44b8870528b15802f3e Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Fri, 25 Aug 2017 16:14:28 -0700
Subject: [PATCH 1/2] Upgrade to go1.9

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

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index 15823fd1760..420fb569ee9 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.8.3
+FROM golang:1.9.1
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index e331872b28f..da72815c9cc 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.8.3-3
+v1.9.1-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index b23a22294cb..b08cbe4783f 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -49,7 +49,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.8.3",
+    go_version = "1.9.1",
 )
 
 docker_repositories()
diff --git a/test/images/Makefile b/test/images/Makefile
index 07b83c79997..8cca9205118 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.8.3
+GOLANG_VERSION=1.9.1
 export
 
 ifndef WHAT

From b1b4770c3c61a7db9b3e425e208993492c7da050 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Mon, 28 Aug 2017 14:27:20 -0700
Subject: [PATCH 2/2] Update bazelbuild/rules_go to support go1.9

---
 build/root/WORKSPACE | 6 +++---
 hack/update-bazel.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index b08cbe4783f..3ac212d4119 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -1,8 +1,8 @@
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "a4ea00b71a6fc3bd381cbbf6eb83ec91fe8b32b1c622c048f1e6f0d965bb1a2d",
-    strip_prefix = "rules_go-a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058",
-    urls = ["https://github.com/bazelbuild/rules_go/archive/a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058.tar.gz"],
+    sha256 = "441e560e947d8011f064bd7348d86940d6b6131ae7d7c4425a538e8d9f884274",
+    strip_prefix = "rules_go-c72631a220406c4fae276861ee286aaec82c5af2",
+    urls = ["https://github.com/bazelbuild/rules_go/archive/c72631a220406c4fae276861ee286aaec82c5af2.tar.gz"],
 )
 
 http_archive(
diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh
index 6bfa9b062d2..91ebb56caba 100755
--- a/hack/update-bazel.sh
+++ b/hack/update-bazel.sh
@@ -39,7 +39,7 @@ kube::util::go_install_from_commit \
     e26fc85d14a1d3dc25569831acc06919673c545a
 kube::util::go_install_from_commit \
     github.com/bazelbuild/rules_go/go/tools/gazelle/gazelle \
-    a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058
+    c72631a220406c4fae276861ee286aaec82c5af2
 
 touch "${KUBE_ROOT}/vendor/BUILD"