From c4b66787575c84eb8edfdd94411fa8883fc5b201 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 14 Jul 2020 20:41:34 -0400 Subject: [PATCH 1/2] Update Golang to v1.14.5 Signed-off-by: Stephen Augustus --- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 4 ++-- build/root/WORKSPACE | 2 +- test/images/Makefile | 2 +- test/images/sample-apiserver/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 535829ee9a4..fc6a38b4c6c 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.14.4-2 +v1.14.5-1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index a016045d206..a47d824d603 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -68,7 +68,7 @@ dependencies: - path: cluster/images/etcd/migrate/options.go - name: "golang" - version: 1.14.4 + version: 1.14.5 refPaths: - path: build/build-image/cross/VERSION - path: build/root/WORKSPACE @@ -133,7 +133,7 @@ dependencies: match: tag = - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.14.4-2 + version: v1.14.5-1 refPaths: - path: build/build-image/cross/VERSION - path: test/images/sample-apiserver/Dockerfile diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index 45e05a4bf0f..faa01133ee6 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -19,7 +19,7 @@ repo_infra_repositories() load("@io_k8s_repo_infra//:repos.bzl", repo_infra_configure = "configure", repo_infra_go_repositories = "go_repositories") repo_infra_configure( - go_version = "1.14.4", + go_version = "1.14.5", minimum_bazel_version = "2.2.0", ) diff --git a/test/images/Makefile b/test/images/Makefile index 9b143758914..4a4f5486240 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= gcr.io/kubernetes-e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v2.9.1 -GOLANG_VERSION=1.14.4 +GOLANG_VERSION=1.14.5 export ifndef WHAT diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index 96d140572e4..efd9337e5b7 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG BASEIMAGE -FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.14.4-2 as build_k8s_1_17_sample_apiserver +FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.14.5-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin From 99c29de8fcdba565dd4ef3eead6a491c3fc6dd35 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 14 Jul 2020 20:55:08 -0400 Subject: [PATCH 2/2] Update repo-infra to 0.0.7 (to support go1.14.5 and go1.13.13) Includes: - bazelbuild/bazel-toolchains@3.3.2 - bazelbuild/rules_go@v0.22.7 Signed-off-by: Stephen Augustus --- build/dependencies.yaml | 2 +- build/root/WORKSPACE | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index a47d824d603..db82b14e18e 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -198,7 +198,7 @@ dependencies: match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"} - name: "repo-infra" - version: 0.0.6 + version: 0.0.7 refPaths: - path: build/root/WORKSPACE match: strip_prefix = "repo-infra-\d+.\d+.\d+" diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index faa01133ee6..efd0d2e20d7 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -5,10 +5,10 @@ load("//build:workspace_mirror.bzl", "mirror") http_archive( name = "io_k8s_repo_infra", - sha256 = "7da9e67cd291e2b3b0503649d1beaf82b10c2483f4061ebe05fb7d19f62442f0", - strip_prefix = "repo-infra-0.0.6", + sha256 = "54036881c2d1e55f76969777298e1c4a3cf44ba6c67fbba948c2bbeba91f19fe", + strip_prefix = "repo-infra-0.0.7", urls = [ - "https://github.com/kubernetes/repo-infra/archive/v0.0.6.tar.gz", + "https://github.com/kubernetes/repo-infra/archive/v0.0.7.tar.gz", ], )