mirror of https://github.com/k3s-io/k3s
Merge pull request #65726 from ixdy/golang-1.10.3
Automatic merge from submit-queue (batch tested with PRs 65677, 65711, 65150, 65726). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update to go1.10.3 **What this PR does / why we need it**: updates to build with go1.10.3; see list of changes [here](https://github.com/golang/go/issues?q=milestone%3AGo1.10.3). We'll probably want to cherrypick this to release-1.11 as well. **Release note**: ```release-note Update to use go1.10.3 ``` /assign @BenTheElder @cbleckerpull/8/head
commit
f29c1301a3
|
@ -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
|
||||
|
|
|
@ -48,7 +48,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue