diff --git a/build/cni/Makefile b/build/cni/Makefile index cc87dd1f665..c3ac5f72b14 100644 --- a/build/cni/Makefile +++ b/build/cni/Makefile @@ -18,7 +18,7 @@ # [ARCH=amd64] [CNI_RELEASE=v0.3.0] make (build|push) ARCH?=amd64 -CNI_RELEASE?=9d5e6e60e79491207834ae8439e80c943db65a69 +CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CUR_DIR=$(shell pwd) OUTPUT_DIR=$(CUR_DIR)/output @@ -45,7 +45,7 @@ push: build gsutil cp $(OUTPUT_DIR)/$(CNI_TARBALL) gs://kubernetes-release/network-plugins 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 clean: diff --git a/cluster/gce/coreos/master-docker.yaml b/cluster/gce/coreos/master-docker.yaml index cb1add788f6..0f9a76cfe1e 100644 --- a/cluster/gce/coreos/master-docker.yaml +++ b/cluster/gce/coreos/master-docker.yaml @@ -35,7 +35,7 @@ coreos: Type=oneshot RemainAfterExit=yes 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/ - name: kubernetes-download-salt.service diff --git a/cluster/gce/coreos/master-rkt.yaml b/cluster/gce/coreos/master-rkt.yaml index cb19a59b692..ac26528054e 100644 --- a/cluster/gce/coreos/master-rkt.yaml +++ b/cluster/gce/coreos/master-rkt.yaml @@ -35,7 +35,7 @@ coreos: Type=oneshot RemainAfterExit=yes 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/ - name: kubernetes-install-docker2aci.service diff --git a/cluster/gce/coreos/node-docker.yaml b/cluster/gce/coreos/node-docker.yaml index 70f68e928fd..5e313fa9670 100644 --- a/cluster/gce/coreos/node-docker.yaml +++ b/cluster/gce/coreos/node-docker.yaml @@ -35,7 +35,7 @@ coreos: Type=oneshot RemainAfterExit=yes 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/ - name: kubernetes-download-manifests.service diff --git a/cluster/gce/coreos/node-rkt.yaml b/cluster/gce/coreos/node-rkt.yaml index 41686633687..2f180aa8e96 100644 --- a/cluster/gce/coreos/node-rkt.yaml +++ b/cluster/gce/coreos/node-rkt.yaml @@ -35,7 +35,7 @@ coreos: Type=oneshot RemainAfterExit=yes 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/ - name: kubernetes-install-rkt.service diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 7cfc99a8a0f..fcd9e3e9743 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -134,8 +134,9 @@ function install-kube-binary-config { if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \ [[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then #TODO(andyzheng0831): We should make the cni version number as a k8s env variable. - local -r cni_tar="cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz" - download-or-bust "" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}" + local -r cni_tar="cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz" + 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" mkdir -p "${cni_dir}" tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 34ff2676f2f..7c1f811480d 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -20,7 +20,7 @@ REGISTRY?=gcr.io/google_containers ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -CNI_RELEASE=9d5e6e60e79491207834ae8439e80c943db65a69 +CNI_RELEASE=07a8a28637e97b22eb8dfe710eeae1344f69d16e UNAME_S:=$(shell uname -s) ifeq ($(UNAME_S),Darwin) diff --git a/cluster/saltbase/salt/cni/init.sls b/cluster/saltbase/salt/cni/init.sls index 7083201d65c..660b4765bdf 100644 --- a/cluster/saltbase/salt/cni/init.sls +++ b/cluster/saltbase/salt/cni/init.sls @@ -19,9 +19,9 @@ cni-tar: - user: root - name: /opt/cni - 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 - - source_hash: md5=1ac2f8c72244f0188b8ba3d6052f9fc1 + - source_hash: md5=dd11b04dcb0b9aca00b5287ba18dcfaa - archive_format: tar - if_missing: /opt/cni/bin diff --git a/test/e2e_node/remote/remote.go b/test/e2e_node/remote/remote.go index e17ab75513c..2c77b9ecbf1 100644 --- a/test/e2e_node/remote/remote.go +++ b/test/e2e_node/remote/remote.go @@ -43,7 +43,7 @@ var sshOptionsMap map[string]string const ( archiveName = "e2e_node_test.tar.gz" - CNIRelease = "9d5e6e60e79491207834ae8439e80c943db65a69" + CNIRelease = "07a8a28637e97b22eb8dfe710eeae1344f69d16e" CNIDirectory = "cni" )