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

Update to Golang 1.13.9 #89275

Merged
merged 3 commits into from Mar 24, 2020
Merged

Update to Golang 1.13.9 #89275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32b61ea
build: Remove kube-cross image building
justaugustus Mar 20, 2020
b6179ac
deps: Update to Golang 1.13.9
justaugustus Mar 20, 2020
979e3e0
build/dependencies: Remove bazel WORKSPACE go_version check
justaugustus Mar 23, 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
79 changes: 0 additions & 79 deletions build/build-image/cross/Dockerfile
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions build/build-image/cross/Makefile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
View file
Open in desktop
@@ -1 +1 @@
v1.13.8-1
v1.13.9-2
liggitt marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 0 additions & 13 deletions build/build-image/cross/cloudbuild.yaml
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions build/dependencies.yaml
View file
Open in desktop
Expand Up @@ -32,13 +32,9 @@ dependencies:


- name: "golang"
version: 1.13.8
version: 1.13.9
refPaths:
- path: build/build-image/cross/Dockerfile
match: "golang:"
- path: build/build-image/cross/VERSION
- path: build/root/WORKSPACE
match: go_version
- path: test/images/Makefile
match: GOLANG_VERSION

Expand Down
23 changes: 20 additions & 3 deletions build/root/WORKSPACE
View file
Open in desktop
Expand Up @@ -48,14 +48,31 @@ http_archive(
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.20.7/rules_go-v0.20.7.tar.gz"),
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.13.8",
# The version of rules_go we're using here is no longer supported, so
# we must manually download a newer version of the go sdk.
go_download_sdk(
name = "go_sdk",
sdks = {
"darwin_amd64": ("go1.13.9.darwin-amd64.tar.gz", "450e59538ed5d3f2b165ba5107530afce6e8e89c6cc5c90a0cbf0a58846ef3b1"),
"freebsd_386": ("go1.13.9.freebsd-386.tar.gz", "6b75a5a46ebbdf06aa5023f2bd0ad7e9e37389125468243368d5795e1c15c9cd"),
"freebsd_amd64": ("go1.13.9.freebsd-amd64.tar.gz", "87716246da52c193226df44031aaf45e45ebfc23e01bdc845311c1b560e76e2b"),
"linux_386": ("go1.13.9.linux-386.tar.gz", "a2744aa2ddc68d888e9f65c2cbe4c8b527b139688ce232ead90dc2961f8d51a8"),
"linux_amd64": ("go1.13.9.linux-amd64.tar.gz", "f4ad8180dd0aaf7d7cda7e2b0a2bf27e84131320896d376549a7d849ecf237d7"),
"linux_arm64": ("go1.13.9.linux-arm64.tar.gz", "b53cb466d7986e5e17a3d4c196bc95df08a35968eced5efd7e128387a246c46e"),
"linux_arm": ("go1.13.9.linux-armv6l.tar.gz", "a3c2941a1fde8692514ece7e2180a0e3ca70609f52756a66bc0ab68c63572361"),
"linux_ppc64le": ("go1.13.9.linux-ppc64le.tar.gz", "90beb01962202f332be0a7c8dad2db3d30242759ba863db3f36c45d241940efc"),
"linux_s390x": ("go1.13.9.linux-s390x.tar.gz", "a40949aaf55912b06df8fda511c33fde3e52d377706bdc095332652c1ad225e3"),
"windows_386": ("go1.13.9.windows-386.zip", "e22406377448f1aea2dd1517327e5ae452d826c0c7624b3511d5af510c57b69a"),
"windows_amd64": ("go1.13.9.windows-amd64.zip", "cf066aabdf4d83c251aaace14b57a35aafffd1fa67d54d907f27fb31e470a135"),
},
Comment on lines +55 to +71
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deep magic from the dawn of time

Copy link
Member

@ixdy ixdy Mar 24, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a little bit of efb21a5 mixed with https://github.com/bazelbuild/rules_go/blob/master/go/private/sdk_list.bzl. :)

)

go_register_toolchains()

http_archive(
name = "io_bazel_rules_docker",
sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
Expand Down
2 changes: 1 addition & 1 deletion test/images/Makefile
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM ?= 7
QEMUVERSION=v2.9.1
GOLANG_VERSION=1.13.8
GOLANG_VERSION=1.13.9
export

ifndef WHAT
Expand Down
2 changes: 1 addition & 1 deletion test/images/sample-apiserver/Dockerfile
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

ARG BASEIMAGE
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.8-1 as build_k8s_1_17_sample_apiserver
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.9-2 as build_k8s_1_17_sample_apiserver

ENV GOPATH /go
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
Expand Down