Skip to content

Commit cadbfd8

Browse files
authored
Merge pull request kubernetes#89275 from justaugustus/go1139
Update to Golang 1.13.9
2 parents 2ab6357 + 979e3e0 commit cadbfd8

File tree

8 files changed

+24
-138
lines changed

8 files changed

+24
-138
lines changed

build/build-image/cross/Dockerfile

Lines changed: 0 additions & 79 deletions
This file was deleted.

build/build-image/cross/Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.13.8-1
1+
v1.13.9-2

build/build-image/cross/cloudbuild.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

build/dependencies.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ dependencies:
3232

3333

3434
- name: "golang"
35-
version: 1.13.8
35+
version: 1.13.9
3636
refPaths:
37-
- path: build/build-image/cross/Dockerfile
38-
match: "golang:"
3937
- path: build/build-image/cross/VERSION
40-
- path: build/root/WORKSPACE
41-
match: go_version
4238
- path: test/images/Makefile
4339
match: GOLANG_VERSION
4440

build/root/WORKSPACE

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,31 @@ http_archive(
4848
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.20.7/rules_go-v0.20.7.tar.gz"),
4949
)
5050

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

5353
go_rules_dependencies()
5454

55-
go_register_toolchains(
56-
go_version = "1.13.8",
55+
# The version of rules_go we're using here is no longer supported, so
56+
# we must manually download a newer version of the go sdk.
57+
go_download_sdk(
58+
name = "go_sdk",
59+
sdks = {
60+
"darwin_amd64": ("go1.13.9.darwin-amd64.tar.gz", "450e59538ed5d3f2b165ba5107530afce6e8e89c6cc5c90a0cbf0a58846ef3b1"),
61+
"freebsd_386": ("go1.13.9.freebsd-386.tar.gz", "6b75a5a46ebbdf06aa5023f2bd0ad7e9e37389125468243368d5795e1c15c9cd"),
62+
"freebsd_amd64": ("go1.13.9.freebsd-amd64.tar.gz", "87716246da52c193226df44031aaf45e45ebfc23e01bdc845311c1b560e76e2b"),
63+
"linux_386": ("go1.13.9.linux-386.tar.gz", "a2744aa2ddc68d888e9f65c2cbe4c8b527b139688ce232ead90dc2961f8d51a8"),
64+
"linux_amd64": ("go1.13.9.linux-amd64.tar.gz", "f4ad8180dd0aaf7d7cda7e2b0a2bf27e84131320896d376549a7d849ecf237d7"),
65+
"linux_arm64": ("go1.13.9.linux-arm64.tar.gz", "b53cb466d7986e5e17a3d4c196bc95df08a35968eced5efd7e128387a246c46e"),
66+
"linux_arm": ("go1.13.9.linux-armv6l.tar.gz", "a3c2941a1fde8692514ece7e2180a0e3ca70609f52756a66bc0ab68c63572361"),
67+
"linux_ppc64le": ("go1.13.9.linux-ppc64le.tar.gz", "90beb01962202f332be0a7c8dad2db3d30242759ba863db3f36c45d241940efc"),
68+
"linux_s390x": ("go1.13.9.linux-s390x.tar.gz", "a40949aaf55912b06df8fda511c33fde3e52d377706bdc095332652c1ad225e3"),
69+
"windows_386": ("go1.13.9.windows-386.zip", "e22406377448f1aea2dd1517327e5ae452d826c0c7624b3511d5af510c57b69a"),
70+
"windows_amd64": ("go1.13.9.windows-amd64.zip", "cf066aabdf4d83c251aaace14b57a35aafffd1fa67d54d907f27fb31e470a135"),
71+
},
5772
)
5873

74+
go_register_toolchains()
75+
5976
http_archive(
6077
name = "io_bazel_rules_docker",
6178
sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",

test/images/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
1616
GOARM ?= 7
1717
QEMUVERSION=v2.9.1
18-
GOLANG_VERSION=1.13.8
18+
GOLANG_VERSION=1.13.9
1919
export
2020

2121
ifndef WHAT

test/images/sample-apiserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

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

1818
ENV GOPATH /go
1919
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin

0 commit comments

Comments
 (0)