From 962fdbcbcafdeaa223fddefa7113d90e39371a16 Mon Sep 17 00:00:00 2001
From: Christoph Blecker <admin@toph.ca>
Date: Wed, 3 Oct 2018 15:11:47 -0700
Subject: [PATCH] Bump golang version to 1.11.1

---
 build/build-image/cross/Dockerfile | 2 +-
 build/build-image/cross/VERSION    | 2 +-
 build/root/WORKSPACE               | 2 +-
 hack/lib/golang.sh                 | 2 +-
 test/images/Makefile               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index ef4737c267..ae3e0c4bce 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.4
+FROM golang:1.11.1
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index 9aa67b0440..a12eee242f 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.10.4-1
+v1.11.1-1
diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
index 62538af429..1f09728e55 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.4",
+    go_version = "1.11.1",
 )
 
 docker_repositories()
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 3b01774feb..c7466f6cae 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -360,7 +360,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(go version)"
   local minimum_go_version
-  minimum_go_version=go1.10.2
+  minimum_go_version=go1.11.1
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     kube::log::usage_from_stdin <<EOF
 Detected go version: ${go_version[*]}.
diff --git a/test/images/Makefile b/test/images/Makefile
index ddb8c80f27..9418f1a9dd 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.4
+GOLANG_VERSION=1.11.1
 export
 
 ifndef WHAT