Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[go1.15] Update to go1.15rc2 #93827

Merged
merged 4 commits into from
Aug 9, 2020
Merged

[go1.15] Update to go1.15rc2 #93827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07c7c9a
[go1.15] build: Update to k/repo-infra@v0.0.11 (supports go1.15rc2)
justaugustus Aug 9, 2020
c3d1099
[go1.15] hack/tools: Update to k/repo-infra@v0.0.11 (supports go1.15rc2)
justaugustus Aug 9, 2020
6733a9c
generated: hack/update-hack-tools.sh && hack/update-vendor.sh
justaugustus Aug 9, 2020
ffcef48
[go1.15] Update to go1.15rc2
justaugustus Aug 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.15.0-rc.1-1
v1.15.0-rc.2-1
10 changes: 5 additions & 5 deletions build/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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+"
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions build/root/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand All @@ -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",
)

Expand Down
2 changes: 1 addition & 1 deletion hack/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
4 changes: 2 additions & 2 deletions hack/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion test/images/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/images/sample-apiserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down