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

Merge pull request #31801 from freehan/cnibump 

Automatic merge from submit-queue

bump cni

closes: #31630 #31724
pull/6/head
Kubernetes Submit Queue 2016-09-06 12:28:48 -07:00 committed by GitHub
parent 9dfe8df7cd 1e88c99e3e
commit b77f20324d
9 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/cni/Makefile
View File

@ -18,7 +18,7 @@
# [ARCH=amd64] [CNI_RELEASE=v0.3.0] make (build|push) # [ARCH=amd64] [CNI_RELEASE=v0.3.0] make (build|push)
ARCH?=amd64 ARCH?=amd64
CNI_RELEASE?=9d5e6e60e79491207834ae8439e80c943db65a69 CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz
CUR_DIR=$(shell pwd) CUR_DIR=$(shell pwd)
OUTPUT_DIR=$(CUR_DIR)/output OUTPUT_DIR=$(CUR_DIR)/output
@ -45,7 +45,7 @@ push: build
gsutil cp $(OUTPUT_DIR)/$(CNI_TARBALL) gs://kubernetes-release/network-plugins gsutil cp $(OUTPUT_DIR)/$(CNI_TARBALL) gs://kubernetes-release/network-plugins
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
gsutil cp cni-$(CNI_RELEASE).tar.gz gs://kubernetes-release/network-plugins gsutil cp $(OUTPUT_DIR)/cni-$(CNI_RELEASE).tar.gz gs://kubernetes-release/network-plugins
endif endif
clean: clean:

2
cluster/gce/coreos/master-docker.yaml
View File

@ -35,7 +35,7 @@ coreos:
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/ ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
- name: kubernetes-download-salt.service - name: kubernetes-download-salt.service

2
cluster/gce/coreos/master-rkt.yaml
View File

@ -35,7 +35,7 @@ coreos:
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/ ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
- name: kubernetes-install-docker2aci.service - name: kubernetes-install-docker2aci.service

2
cluster/gce/coreos/node-docker.yaml
View File

@ -35,7 +35,7 @@ coreos:
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/ ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
- name: kubernetes-download-manifests.service - name: kubernetes-download-manifests.service

2
cluster/gce/coreos/node-rkt.yaml
View File

@ -35,7 +35,7 @@ coreos:
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/ ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
- name: kubernetes-install-rkt.service - name: kubernetes-install-rkt.service

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

@ -134,8 +134,9 @@ 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. #TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
local -r cni_tar="cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz" local -r cni_tar="cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz"
download-or-bust "" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}" local -r cni_sha1="19d49f7b2b99cd2493d5ae0ace896c64e289ccbb"
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}"
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite

2
cluster/images/hyperkube/Makefile
View File

@ -20,7 +20,7 @@
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
CNI_RELEASE=9d5e6e60e79491207834ae8439e80c943db65a69 CNI_RELEASE=07a8a28637e97b22eb8dfe710eeae1344f69d16e
UNAME_S:=$(shell uname -s) UNAME_S:=$(shell uname -s)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)

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

@ -19,9 +19,9 @@ cni-tar:
- user: root - user: root
- name: /opt/cni - name: /opt/cni
- makedirs: True - makedirs: True
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
- tar_options: v - tar_options: v
- source_hash: md5=1ac2f8c72244f0188b8ba3d6052f9fc1 - source_hash: md5=dd11b04dcb0b9aca00b5287ba18dcfaa
- archive_format: tar - archive_format: tar
- if_missing: /opt/cni/bin - if_missing: /opt/cni/bin

2
test/e2e_node/remote/remote.go
View File

@ -43,7 +43,7 @@ var sshOptionsMap map[string]string
const ( const (
archiveName = "e2e_node_test.tar.gz" archiveName = "e2e_node_test.tar.gz"
CNIRelease = "9d5e6e60e79491207834ae8439e80c943db65a69" CNIRelease = "07a8a28637e97b22eb8dfe710eeae1344f69d16e"
CNIDirectory = "cni" CNIDirectory = "cni"
) )