Merge pull request #83213 from cblecker/automated-cherry-pick-of-#831…

…39-upstream-release-1.16 Automated cherry pick of #83139: Update to use go1.12.10
kubernetes · Sep 27, 2019 · 640b5f5 · 640b5f5
2 parents 40b5523 0f68b52
commit 640b5f5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
@@ -15,7  15,7 @@
 # This file creates a standard build environment for building cross
 # platform go binary for the architecture kubernetes cares about.
 
-FROM golang:1.12.9
 FROM golang:1.12.10
 
 ENV GOARM 7
 ENV KUBE_DYNAMIC_CROSSPLATFORMS \

diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
@@ -1  1 @@
-v1.12.9-1
 v1.12.10-1
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
@@ -34,7  34,7 @@ dependencies:
 
 
   - name: "golang"
-    version: 1.12.9
     version: 1.12.10
     refPaths:
     - path: build/build-image/cross/Dockerfile
       match: "golang:"

diff --git a/build/root/WORKSPACE b/build/root/WORKSPACE
@@ -44,16  44,16 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "f635b285d7e902ac7327637edbba98a4f110e8202c8f4fb49d2f6ecd837f704a",
-    urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.18.9/rules_go-0.18.9.tar.gz"),
     sha256 = "5c02dd4436332f8efa982ce2102daf7c041ae95c2bc7f2d26aceed20dc47def8",
     urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/v0.18.11/rules_go-v0.18.11.tar.gz"),
 )
 
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.12.9",
     go_version = "1.12.10",
 )
 
 http_archive(

diff --git a/test/images/Makefile b/test/images/Makefile
@@ -17,7  17,7 @@ include  ../../hack/make-rules/Makefile.manifest
 REGISTRY ?= gcr.io/kubernetes-e2e-test-images
 GOARM ?= 7
 QEMUVERSION=v2.9.1
-GOLANG_VERSION=1.12.9
 GOLANG_VERSION=1.12.10
 export
 
 ifndef WHAT