github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Update go version to go1.8rc2 and fix the addon-manager changelog

Browse Source
This commit is contained in:
Lucas Käldström 2017-01-27 22:44:18 +02:00
parent 6789d4e637
commit 914824cc09
No known key found for this signature in database
GPG Key ID: 600FEFBBD0D40D21
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ RUN export ETCD_VERSION=v3.0.14; \
&& ln -s ../src/etcd/etcd-${ETCD_VERSION}-linux-amd64/etcd /usr/local/bin/
# TODO: Remove the need for two golang versions; when we use go1.8 for all other builds we can remove this
ENV K8S_GOLANG_EDGE_VERSION=1.8rc1 \
ENV K8S_GOLANG_EDGE_VERSION=1.8rc2 \
K8S_EDGE_GOROOT=/usr/local/go_k8s_edge
RUN mkdir -p ${K8S_EDGE_GOROOT} \
&& curl -sSL https://golang.org/dl/go${K8S_GOLANG_EDGE_VERSION}.linux-amd64.tar.gz | tar -xz -C ${K8S_EDGE_GOROOT} --strip-components=1

2
cluster/addons/addon-manager/CHANGELOG.md
View File

@ -1,4 +1,4 @@
### Version 6.2 (Wed January 18 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
### Version 6.3 (Fri January 27 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
- Updated the arm base image to `armhf/busybox` and now using qemu v2.7 for emulation.
### Version 6.2 (Thu January 12 2017 Zihong Zheng <zihongz@google.com>)