From e1f7b16fa68ad50f71336b9718a38ba6e61cd723 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Sun, 12 Jan 2020 01:16:32 +0200 Subject: [PATCH] Update to golang@1.13.6 Signed-off-by: ialidzhikov --- build/build-image/cross/Dockerfile | 2 +- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 2 +- build/root/WORKSPACE | 6 +++--- test/images/Makefile | 2 +- test/images/sample-apiserver/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index c742108b6c8..3144f3bd718 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.13.5 +FROM golang:1.13.6 ENV GOARM 7 ENV KUBE_DYNAMIC_CROSSPLATFORMS \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 0553dfb107f..8999ee58a0a 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.13.5-1 +v1.13.6-1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index f40d57f6c2e..5b08d35dde1 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -32,7 +32,7 @@ dependencies: - name: "golang" - version: 1.13.5 + version: 1.13.6 refPaths: - path: build/build-image/cross/Dockerfile match: "golang:" diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 945f6c5a4ed..a33d44899aa 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -44,8 +44,8 @@ http_archive( http_archive( name = "io_bazel_rules_go", - sha256 = "a391df56b95d4721004b10cd3fcc63ad4cc8fb2ce165453d1b78ce59162afe29", - urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.9/rules_go-v0.19.9.tar.gz"), + sha256 = "0a99597dd30ecfd94f64fc64717cd1b6c4bd9807918942a8501a3883990e4b1d", + urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.19.10/rules_go-v0.19.10.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.13.5", + go_version = "1.13.6", ) http_archive( diff --git a/test/images/Makefile b/test/images/Makefile index 53d90a6119e..5b50edcf744 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.13.5 +GOLANG_VERSION=1.13.6 export ifndef WHAT diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index 74ded53374a..fcdadf58d51 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/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.13.5-1 as build_k8s_1_17_sample_apiserver +FROM k8s.gcr.io/kube-cross:v1.13.6-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin