github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to use go1.10.1

pull/8/head
Christoph Blecker 2018-03-30 15:26:18 -07:00
parent 3538676841
commit 9690d44fca
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Dockerfile
View File

@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.9.3 FROM golang:1.10.1
ENV GOARM 7 ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.9.3-2 v1.10.1-1

7
build/root/WORKSPACE
View File

@ -1,8 +1,7 @@
http_archive( http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
sha256 = "66282d078c1847c2d876c02c5dabd4fd57cc75eb41a9668a2374352fa73b4587", sha256 = "4b2c61795ac2eefcb28f3eb8e1cb2d8fb3c2eafa0f6712473bc5f93728f38758",
strip_prefix = "rules_go-ff7e3364d9383cf14155f8c2efc87218d07eb03b", urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.10.2/rules_go-0.10.2.tar.gz"],
urls = ["https://github.com/bazelbuild/rules_go/archive/ff7e3364d9383cf14155f8c2efc87218d07eb03b.tar.gz"],
) )
http_archive( http_archive(
@ -46,7 +45,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker
go_rules_dependencies() go_rules_dependencies()
go_register_toolchains( go_register_toolchains(
go_version = "1.9.3", go_version = "1.10.1",
) )
docker_repositories() docker_repositories()

2
test/images/Makefile
View File

@ -15,7 +15,7 @@
REGISTRY ?= gcr.io/kubernetes-e2e-test-images REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM=7 GOARM=7
QEMUVERSION=v2.9.1 QEMUVERSION=v2.9.1
GOLANG_VERSION=1.9.3 GOLANG_VERSION=1.10.1
export export
ifndef WHAT ifndef WHAT