coderwangke
diff --git a/‎build/build-image/cross/Dockerfile
Lines changed: 0 additions & 79 deletions b/‎build/build-image/cross/Dockerfile
Lines changed: 0 additions & 79 deletions
diff --git a/‎build/build-image/cross/Makefile
Lines changed: 0 additions & 35 deletions b/‎build/build-image/cross/Makefile
Lines changed: 0 additions & 35 deletions
diff --git a/‎build/build-image/cross/VERSION
Lines changed: 1 addition & 1 deletion b/‎build/build-image/cross/VERSION
Lines changed: 1 addition & 1 deletion
diff --git a/‎build/build-image/cross/cloudbuild.yaml
Lines changed: 0 additions & 13 deletions b/‎build/build-image/cross/cloudbuild.yaml
Lines changed: 0 additions & 13 deletions
diff --git a/‎build/dependencies.yaml
Lines changed: 1 addition & 5 deletions b/‎build/dependencies.yaml
Lines changed: 1 addition & 5 deletions
diff --git a/‎build/root/WORKSPACE
Lines changed: 20 additions & 3 deletions b/‎build/root/WORKSPACE
Lines changed: 20 additions & 3 deletions
diff --git a/‎test/images/Makefile
Lines changed: 1 addition & 1 deletion b/‎test/images/Makefile
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/images/sample-apiserver/Dockerfile
Lines changed: 1 addition & 1 deletion b/‎test/images/sample-apiserver/Dockerfile
Lines changed: 1 addition & 1 deletion
@@ -1 +1 @@
-v1.13.8-1
+v1.13.9-2
@@ -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
 
 
@@ -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"),
+    },
 )
 
+go_register_toolchains()
+
 http_archive(
     name = "io_bazel_rules_docker",
     sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
 
@@ -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
 
@@ -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