From 37f091eadf0a6b61026a231727125cc958611489 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Thu, 13 Jun 2019 10:49:57 +0800 Subject: [PATCH] update to go 1.12.6 Signed-off-by: Jintao Zhang --- 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 952c00bcb2c..47ac3ba56f9 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.5 +FROM golang:1.12.6 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index ffe90318adf..2d949b553c4 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.12.5-1 +v1.12.6-1 diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 632f765420d..0446f4715e8 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -44,8 +44,8 @@ http_archive( http_archive( name = "io_bazel_rules_go", - sha256 = "87a089eabf919de29eb4711daa52ffbc4b22b2c045949c20503357a3cadf1037", - urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.5/rules_go-0.17.5.tar.gz"), + sha256 = "ce1afed0075e01bd883cfbafbbcc26bfab392eb24854e07a20be78ab13f9e15e", + urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.17.7/rules_go-0.17.7.tar.gz"), ) load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") @@ -53,7 +53,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.5", + go_version = "1.12.6", ) http_archive( diff --git a/test/images/Makefile b/test/images/Makefile index f664b5fa261..d0d807f2f27 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.5 +GOLANG_VERSION=1.12.6 export ifndef WHAT