From 10713501bdacae2442a06034cf090972baf988fd Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 18 Sep 2018 13:13:57 -0700
Subject: [PATCH] Update to golang 1.10.4

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

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index 2134ab312b..ef4737c267 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.3
+FROM golang:1.10.4
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index e5b4243709..9aa67b0440 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.10.3-1
+v1.10.4-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 23a59acbf6..1957896f10 100644
--- a/build/root/WORKSPACE
+++ b/build/root/WORKSPACE
@@ -48,7 +48,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.10.3",
+    go_version = "1.10.4",
 )
 
 docker_repositories()
diff --git a/test/images/Makefile b/test/images/Makefile
index 47c9d46ad2..ddb8c80f27 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.3
+GOLANG_VERSION=1.10.4
 export
 
 ifndef WHAT
diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile
index 37e9394d3e..333dfae10d 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.3-1 as build_k8s_1_7_sample_apiserver
+FROM k8s.gcr.io/kube-cross:v1.10.4-1 as build_k8s_1_7_sample_apiserver
 
 ENV GOPATH /go
 RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin