From b71e74626e7bebf8d9b0289480d1c3c73a7976fc Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Sat, 3 Nov 2018 14:10:45 -0700 Subject: [PATCH] Bump golang version to 1.11.2 --- build/build-image/cross/Dockerfile | 2 +- build/build-image/cross/VERSION | 2 +- build/root/WORKSPACE | 2 +- test/images/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index c9d058d2602..8e4bc0f8843 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.11.1 +FROM golang:1.11.2 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 7cd7543d299..19abf8ebbbf 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.11.1-2 +v1.11.2-1 diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 33bd8c98ebd..5b26fa09daf 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -49,7 +49,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit go_rules_dependencies() go_register_toolchains( - go_version = "1.11.1", + go_version = "1.11.2", ) docker_repositories() diff --git a/test/images/Makefile b/test/images/Makefile index 9418f1a9dd2..089c2696de9 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.11.1 +GOLANG_VERSION=1.11.2 export ifndef WHAT