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

Update all binary download references to v0.6.0

pull/6/head
Di Xu 2017-08-24 14:26:53 +08:00
parent fe0c4064e2
commit dba448c2a6
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/debian-hyperkube-base/Makefile
View File

@ -24,10 +24,10 @@ ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2 BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CNI_TARBALL=cni-plugins-$(ARCH)-$(CNI_VERSION).tgz
.PHONY: all build push clean .PHONY: all build push clean
@ -48,8 +48,8 @@ ifeq ($(CACHEBUST),1)
cd ${TEMP_DIR} && sed -i.back "s|CACHEBUST|$(shell uuidgen)|g" Dockerfile cd ${TEMP_DIR} && sed -i.back "s|CACHEBUST|$(shell uuidgen)|g" Dockerfile
endif endif
mkdir -p ${TEMP_DIR}/cni-bin mkdir -p ${TEMP_DIR}/cni-bin/bin
tar -xz -C ${TEMP_DIR}/cni-bin -f "cni-tars/${CNI_TARBALL}" tar -xz -C ${TEMP_DIR}/cni-bin/bin -f "cni-tars/${CNI_TARBALL}"
# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel # Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static:register --reset

10
cluster/gce/container-linux/configure.sh
View File

@ -110,13 +110,13 @@ function install-kube-binary-config {
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \ if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \
[[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then [[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable. local -r cni_version="v0.6.0"
local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz" local -r cni_tar="cni-plugins-amd64-${cni_version}.tgz"
local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c" local -r cni_sha1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}" download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
local -r cni_dir="${KUBE_HOME}/cni" local -r cni_dir="${KUBE_HOME}/cni"
mkdir -p "${cni_dir}" mkdir -p "${cni_dir}/bin"
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}/bin" --overwrite
mv "${cni_dir}/bin"/* "${kube_bin}" mv "${cni_dir}/bin"/* "${kube_bin}"
rmdir "${cni_dir}/bin" rmdir "${cni_dir}/bin"
rm -f "${KUBE_HOME}/${cni_tar}" rm -f "${KUBE_HOME}/${cni_tar}"

10
cluster/gce/gci/configure.sh
View File

@ -170,9 +170,9 @@ function install-node-problem-detector {
} }
function install-cni-binaries { function install-cni-binaries {
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable. local -r cni_version="v0.6.0"
local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz" local -r cni_tar="cni-plugins-amd64-${cni_version}.tgz"
local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c" local -r cni_sha1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
if is-preloaded "${cni_tar}" "${cni_sha1}"; then if is-preloaded "${cni_tar}" "${cni_sha1}"; then
echo "${cni_tar} is preloaded." echo "${cni_tar} is preloaded."
return return
@ -181,8 +181,8 @@ function install-cni-binaries {
echo "Downloading cni binaries" echo "Downloading cni binaries"
download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}" download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
local -r cni_dir="${KUBE_HOME}/cni" local -r cni_dir="${KUBE_HOME}/cni"
mkdir -p "${cni_dir}" mkdir -p "${cni_dir}/bin"
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}/bin" --overwrite
mv "${cni_dir}/bin"/* "${KUBE_BIN}" mv "${cni_dir}/bin"/* "${KUBE_BIN}"
rmdir "${cni_dir}/bin" rmdir "${cni_dir}/bin"
rm -f "${KUBE_HOME}/${cni_tar}" rm -f "${KUBE_HOME}/${cni_tar}"

6
cluster/saltbase/salt/cni/init.sls
View File

@ -17,11 +17,11 @@ cni-tar:
archive: archive:
- extracted - extracted
- user: root - user: root
- name: /home/kubernetes - name: /home/kubernetes/bin
- makedirs: True - makedirs: True
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz
- tar_options: v - tar_options: v
- source_hash: md5=afbb526e7d976f98353ac96f73043031 - source_hash: md5=9534876FAE7DBE813CDAB404DC1F9219
- archive_format: tar - archive_format: tar
- if_missing: /home/kubernetes/bin - if_missing: /home/kubernetes/bin

7
test/e2e_node/remote/utils.go
View File

@ -27,10 +27,11 @@ import (
// utils.go contains functions used across test suites. // utils.go contains functions used across test suites.
const ( const (
cniRelease = "0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff" cniVersion = "v0.6.0"
cniDirectory = "cni" // The CNI tarball creates the "bin" directory under "cni". cniArch = "amd64"
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
cniConfDirectory = "cni/net.d" cniConfDirectory = "cni/net.d"
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-" + cniRelease + ".tar.gz" cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-" + cniArch + "-" + cniVersion + ".tgz"
) )
const cniConfig = `{ const cniConfig = `{