Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ac731ed2
Commit
ac731ed2
authored
May 04, 2018
by
Mark Janssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to go1.10.2
parent
2f694e8f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
Dockerfile
build/build-image/cross/Dockerfile
+1
-1
VERSION
build/build-image/cross/VERSION
+1
-1
WORKSPACE
build/root/WORKSPACE
+3
-3
golang.sh
hack/lib/golang.sh
+1
-1
Makefile
test/images/Makefile
+1
-1
No files found.
build/build-image/cross/Dockerfile
View file @
ac731ed2
...
@@ -15,7 +15,7 @@
...
@@ -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.10.
1
FROM
golang:1.10.
2
ENV
GOARM 7
ENV
GOARM 7
ENV
KUBE_DYNAMIC_CROSSPLATFORMS \
ENV
KUBE_DYNAMIC_CROSSPLATFORMS \
...
...
build/build-image/cross/VERSION
View file @
ac731ed2
v1.10.
1
-1
v1.10.
2
-1
build/root/WORKSPACE
View file @
ac731ed2
...
@@ -2,8 +2,8 @@ load("//build:workspace_mirror.bzl", "mirror")
...
@@ -2,8 +2,8 @@ load("//build:workspace_mirror.bzl", "mirror")
http_archive(
http_archive(
name = "io_bazel_rules_go",
name = "io_bazel_rules_go",
sha256 = "
4b2c61795ac2eefcb28f3eb8e1cb2d8fb3c2eafa0f6712473bc5f93728f38758
",
sha256 = "
6c770aece75ac47fe218ad881775c37cf29db013ab751d0bfef01c0b5a6ee01f
",
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.
2/rules_go-0.10.2
.tar.gz"),
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.10.
4/rules_go-0.10.4
.tar.gz"),
)
)
http_archive(
http_archive(
...
@@ -47,7 +47,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker
...
@@ -47,7 +47,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.10.
1
",
go_version = "1.10.
2
",
)
)
docker_repositories()
docker_repositories()
...
...
hack/lib/golang.sh
View file @
ac731ed2
...
@@ -321,7 +321,7 @@ EOF
...
@@ -321,7 +321,7 @@ EOF
local
go_version
local
go_version
IFS
=
" "
read
-ra
go_version
<<<
"
$(
go version
)
"
IFS
=
" "
read
-ra
go_version
<<<
"
$(
go version
)
"
local
minimum_go_version
local
minimum_go_version
minimum_go_version
=
go1.10.
1
minimum_go_version
=
go1.10.
2
if
[[
"
${
minimum_go_version
}
"
!=
$(
echo
-e
"
${
minimum_go_version
}
\n
${
go_version
[2]
}
"
|
sort
-s
-t
.
-k
1,1
-k
2,2n
-k
3,3n |
head
-n1
)
&&
"
${
go_version
[2]
}
"
!=
"devel"
]]
;
then
if
[[
"
${
minimum_go_version
}
"
!=
$(
echo
-e
"
${
minimum_go_version
}
\n
${
go_version
[2]
}
"
|
sort
-s
-t
.
-k
1,1
-k
2,2n
-k
3,3n |
head
-n1
)
&&
"
${
go_version
[2]
}
"
!=
"devel"
]]
;
then
kube::log::usage_from_stdin
<<
EOF
kube::log::usage_from_stdin
<<
EOF
Detected go version:
${
go_version
[*]
}
.
Detected go version:
${
go_version
[*]
}
.
...
...
test/images/Makefile
View file @
ac731ed2
...
@@ -15,7 +15,7 @@
...
@@ -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.10.
1
GOLANG_VERSION
=
1.10.
2
export
export
ifndef
WHAT
ifndef
WHAT
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment