From 3e8c27af34991c0ca5c78f3e216bc15916927a09 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Thu, 25 May 2017 11:07:46 +0200
Subject: [PATCH] Bump Go version to 1.8.3

---
 build/build-image/cross/Dockerfile           | 2 +-
 build/build-image/cross/VERSION              | 2 +-
 build/root/WORKSPACE                         | 8 ++++----
 cluster/images/etcd-version-monitor/Makefile | 4 ++--
 test/images/serve_hostname/Makefile          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index d2887e9b55..a5e6183b87 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.1
+FROM golang:1.8.3
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index de541432f1..490e779dc9 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.8.1-2
+v1.8.3-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index fe0c36382c..e01bbb336a 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -1,8 +1,8 @@
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "a1cae429e9d591017421150e3173478c46c693bc594322c7fa7e6cb5f672ef59",
-    strip_prefix = "rules_go-805fd1566500997379806373feb05e138a4dfe28",
-    urls = ["https://github.com/bazelbuild/rules_go/archive/805fd1566500997379806373feb05e138a4dfe28.tar.gz"],
+    sha256 = "64294fd0e74d2aafa03ec3a1f2f9c167e27d17c9a5cf393e8bf79e43258de73d",
+    strip_prefix = "rules_go-a9df110cf04e167b33f10473c7e904d780d921e6",
+    urls = ["https://github.com/bazelbuild/rules_go/archive/a9df110cf04e167b33f10473c7e904d780d921e6.tar.gz"],
 )
 
 http_archive(
@@ -33,7 +33,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_repositories")
 load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories")
 
 go_repositories(
-    go_version = "1.8.1",
+    go_version = "1.8.3",
 )
 
 docker_repositories()
diff --git a/cluster/images/etcd-version-monitor/Makefile b/cluster/images/etcd-version-monitor/Makefile
index 1149f4a0ae..09fb29607d 100644
--- a/cluster/images/etcd-version-monitor/Makefile
+++ b/cluster/images/etcd-version-monitor/Makefile
@@ -15,10 +15,10 @@
 # Build the etcd-version-monitor image
 #
 # Usage:
-# 	[GOLANG_VERSION=1.8.1] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
+# 	[GOLANG_VERSION=1.8.3] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
 # TODO(shyamjvs): Support architectures other than amd64 if needed.
 ARCH:=amd64
-GOLANG_VERSION?=1.8.1
+GOLANG_VERSION?=1.8.3
 REGISTRY?=gcr.io/google-containers
 TAG?=0.1.0
 IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
diff --git a/test/images/serve_hostname/Makefile b/test/images/serve_hostname/Makefile
index 9cb104ec73..fce55966e4 100644
--- a/test/images/serve_hostname/Makefile
+++ b/test/images/serve_hostname/Makefile
@@ -31,7 +31,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x
 
 GOARM=7
 TEMP_DIR := $(shell mktemp -d)
-GOLANG_VERSION=1.8.1
+GOLANG_VERSION=1.8.3
 
 BIN = serve_hostname
 SRCS = serve_hostname.go