From 759121309f1be442b1ae8083885c5bfc3aa216e9 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Sun, 14 Apr 2019 21:01:00 -0700
Subject: [PATCH] Update to go 1.12.4

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

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index b0cd8ed3fe9f..f0d0cd1f482a 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.12.1
+FROM golang:1.12.4
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index c167785a48db..3ff2cc2b66fc 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.12.1-2
+v1.12.4-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index b0a1501f6b71..5c7932817e85 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -21,8 +21,8 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "6433336b4c5feb54e2f45df4c1c84ea4385b2dc0b6f274ec2cd5d745045eae1f",
-    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.2/rules_go-0.17.2.tar.gz"),
+    sha256 = "91b79f4758fd16f2c6426279ce00c1d2d8577d61c519db39675ed84657e1a95e",
+    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.4/rules_go-0.17.4.tar.gz"),
 )
 
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
@@ -30,7 +30,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.12.1",
+    go_version = "1.12.4",
 )
 
 http_archive(
diff --git a/test/images/Makefile b/test/images/Makefile
index 679352771ff3..c5a1797e01fc 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.12.1
+GOLANG_VERSION=1.12.4
 export
 
 ifndef WHAT