Merge pull request #68802 from ixdy/golang-1.10.4

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 \

build/build-image/cross/VERSION

-v1.10.3-1
+v1.10.4-1

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()

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

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