Skip to content
Permalink
Browse files

Merge pull request #65984 from ixdy/automated-cherry-pick-of-#65726-u…

…pstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #65726: Update to go1.10.3

Cherry pick of #65726 on release-1.11.

#65726: Update to go1.10.3
  • Loading branch information...
Kubernetes Submit Queue
Kubernetes Submit Queue committed Jul 12, 2018
2 parents e3db721 + 1904bde commit edcd356d6630f298919639d6613b1b8a3778f5f4
Showing with 8 additions and 8 deletions.
  1. +1 −1 build/build-image/cross/Dockerfile
  2. +1 −1 build/build-image/cross/VERSION
  3. +5 −5 build/root/WORKSPACE
  4. +1 −1 test/images/Makefile
@@ -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.10.2
FROM golang:1.10.3

ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
@@ -1 +1 @@
v1.10.2-1
v1.10.3-1
@@ -3,8 +3,8 @@ load("//build:workspace.bzl", "CRI_TOOLS_VERSION")

http_archive(
name = "io_bazel_rules_go",
sha256 = "6c770aece75ac47fe218ad881775c37cf29db013ab751d0bfef01c0b5a6ee01f",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.4/rules_go-0.10.4.tar.gz"),
sha256 = "242602c9818a83cbe97d1446b48263dcd48949a74d713c172d1b03da841b168a",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.5/rules_go-0.10.5.tar.gz"),
)

http_archive(
@@ -42,13 +42,13 @@ load("@bazel_skylib//:lib.bzl", "versions")

versions.check(minimum_bazel_version = "0.13.0")

load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains", "go_download_sdk")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker_pull")
load("@io_bazel_rules_go//go:def.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_repositories")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.10.2",
go_version = "1.10.3",
)

docker_repositories()
@@ -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.10.2
GOLANG_VERSION=1.10.3
export

ifndef WHAT

0 comments on commit edcd356

Please sign in to comment.
You can’t perform that action at this time.