From 07c7c9a55bb1c6c014ff955330c3c249c5f112f6 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sun, 9 Aug 2020 02:11:26 -0400 Subject: [PATCH 1/4] [go1.15] build: Update to k/repo-infra@v0.0.11 (supports go1.15rc2) 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 988248bcf2e..51fb5591186 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: # Bazel - name: "repo-infra" - version: 0.0.10 + version: 0.0.11 refPaths: - path: build/root/WORKSPACE match: strip_prefix = "repo-infra-\d+.\d+.\d+" diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE index da01425eb6b..57f9b13c7e3 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -6,10 +6,10 @@ load("//build:workspace_mirror.bzl", "mirror") # TODO(go1.15): Update once we've published a repo-infra release that supports go1.15 http_archive( name = "io_k8s_repo_infra", - strip_prefix = "repo-infra-0.0.10", - sha256 = "b2d39b7d32eab3bf85bf693685b315ece4f942fca4110cf24aac3f260f2f3c6c", + strip_prefix = "repo-infra-0.0.11", + sha256 = "93da34ad63b1f95db22980becfef7d1cae6f99a84bdd16467edf68956d4288bb", urls = [ - "https://github.com/kubernetes/repo-infra/archive/v0.0.10.tar.gz", + "https://github.com/kubernetes/repo-infra/archive/v0.0.11.tar.gz", ], ) From c3d109920512a8913e271d00a8ad0374c6e9e678 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sun, 9 Aug 2020 02:22:24 -0400 Subject: [PATCH 2/4] [go1.15] hack/tools: Update to k/repo-infra@v0.0.11 (supports go1.15rc2) Signed-off-by: Stephen Augustus --- hack/tools/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/tools/go.mod b/hack/tools/go.mod index f66b3f3859e..3948a129751 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -11,5 +11,5 @@ require ( gotest.tools v2.2.0+incompatible gotest.tools/gotestsum v0.3.5 honnef.co/go/tools v0.0.1-2020.1.4 - k8s.io/repo-infra v0.0.10 + k8s.io/repo-infra v0.0.11 ) From 6733a9c47052bfef65ac8f474ef9617bb45c457b Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sun, 9 Aug 2020 02:28:18 -0400 Subject: [PATCH 3/4] generated: hack/update-hack-tools.sh && hack/update-vendor.sh Signed-off-by: Stephen Augustus --- hack/tools/go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 66645a9607f..9fe78231726 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -708,8 +708,8 @@ honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco= k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/repo-infra v0.0.10 h1:nmyGBEIAG8BhzgT052lR5aaIMNEBHGep+Gl9dqMb7s8= -k8s.io/repo-infra v0.0.10/go.mod h1:WfvjbUCy0f1fsyHq6sF825VYMfAh9pQdkYCa35OZRJc= +k8s.io/repo-infra v0.0.11 h1:cSxJ7c6qIG4ImjsaJEQ2+FZnh6CbV7x9yz3je6Mme4k= +k8s.io/repo-infra v0.0.11/go.mod h1:WfvjbUCy0f1fsyHq6sF825VYMfAh9pQdkYCa35OZRJc= mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= From ffcef48b83c52b74b0096182a37d0d9b80b0a02e Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Sun, 9 Aug 2020 02:36:39 -0400 Subject: [PATCH 4/4] [go1.15] Update to go1.15rc2 Signed-off-by: Stephen Augustus --- build/build-image/cross/VERSION | 2 +- build/dependencies.yaml | 8 ++++---- build/root/WORKSPACE | 2 +- test/images/Makefile | 2 +- test/images/sample-apiserver/Dockerfile | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index e8733feda3d..2ce8310358f 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.15.0-rc.1-1 +v1.15.0-rc.2-1 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 51fb5591186..815590c2e0f 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -83,20 +83,20 @@ dependencies: # Golang - name: "golang" - version: 1.15.0-rc.1 + version: 1.15.0-rc.2 refPaths: - path: build/build-image/cross/VERSION - path: build/root/WORKSPACE match: (override_)?go_version = "((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)" - name: "golang: upstream container image" - version: 1.15rc1 + version: 1.15rc2 refPaths: - path: test/images/Makefile - match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)\d+ + match: GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+ - name: "k8s.gcr.io/kube-cross: dependents" - version: v1.15.0-rc.1-1 + version: v1.15.0-rc.2-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 57f9b13c7e3..cad678de818 100644 --- a/build/root/WORKSPACE +++ b/build/root/WORKSPACE @@ -27,7 +27,7 @@ repo_infra_configure( # TODO(go1.15): Uncomment once we've published a repo-infra release that supports go1.15 #go_version = "1.15.0", # TODO(go1.15): Comment out once we've published a repo-infra release that supports go1.15 - override_go_version = "1.15.0-rc.1", + override_go_version = "1.15.0-rc.2", minimum_bazel_version = "2.2.0", ) diff --git a/test/images/Makefile b/test/images/Makefile index dc72465a861..61414d1d7ec 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.15rc1 +GOLANG_VERSION=1.15rc2 export ifndef WHAT diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index 613be76e231..9724e0ba8ba 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG BASEIMAGE -FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.1-1 as build_k8s_1_17_sample_apiserver +FROM k8s.gcr.io/build-image/kube-cross:v1.15.0-rc.2-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin