From d9bc9055777d3ac01320f2ef42a4e62dfe26046f Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 29 Jan 2018 17:39:05 -0800 Subject: [PATCH 1/2] Update bazelbuild/rules_go to support go1.9.3 --- build/root/WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 56df277557a..6dd8c0390af 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -1,8 +1,8 @@ http_archive( name = "io_bazel_rules_go", - sha256 = "0efdc3cca8ac1c29e1c837bee260dab537dfd373eb4c43c7d50246a142a7c098", - strip_prefix = "rules_go-74d8ad8f9f59a1d9a7cf066d0980f9e394acccd7", - urls = ["https://github.com/bazelbuild/rules_go/archive/74d8ad8f9f59a1d9a7cf066d0980f9e394acccd7.tar.gz"], + sha256 = "af4281751a0e3b5d87fb6a52c83d358871b4f83d7acbe6e65a901fba6612a03e", + strip_prefix = "rules_go-bdf2df58c0d352ffa262ae4b36c7a1a2d6e3f0c9", + urls = ["https://github.com/bazelbuild/rules_go/archive/bdf2df58c0d352ffa262ae4b36c7a1a2d6e3f0c9.tar.gz"], ) http_archive( From c555a7f3c95d740bea5fa249dd30bcbdc7328a7a Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 29 Jan 2018 17:44:28 -0800 Subject: [PATCH 2/2] Update to go1.9.3 --- 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 1b6170ba2af..4a548d0b680 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.9.2 +FROM golang:1.9.3 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index c67c6bbfd8c..6cdbb2f2236 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.9.2-1 +v1.9.3-1 diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 6dd8c0390af..da37fea67b1 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -46,7 +46,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker go_rules_dependencies() go_register_toolchains( - go_version = "1.9.2", + go_version = "1.9.3", ) docker_repositories() diff --git a/test/images/Makefile b/test/images/Makefile index 0140d3234cf..bbb15fb80d7 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -15,7 +15,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images GOARM=7 QEMUVERSION=v2.9.1 -GOLANG_VERSION=1.9.2 +GOLANG_VERSION=1.9.3 export ifndef WHAT