mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
bump cni to 9d5e6e6
This commit is contained in:
parent
610a978e48
commit
69e540e634
@ -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-8a936732094c0941e1543ef5d292a1f4fffa1ac5.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-9d5e6e60e79491207834ae8439e80c943db65a69.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
|
||||||
|
@ -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-8a936732094c0941e1543ef5d292a1f4fffa1ac5.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-9d5e6e60e79491207834ae8439e80c943db65a69.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
|
||||||
|
@ -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-8a936732094c0941e1543ef5d292a1f4fffa1ac5.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-9d5e6e60e79491207834ae8439e80c943db65a69.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
|
||||||
|
@ -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-8a936732094c0941e1543ef5d292a1f4fffa1ac5.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-9d5e6e60e79491207834ae8439e80c943db65a69.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
|
||||||
|
@ -134,7 +134,7 @@ 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-8a936732094c0941e1543ef5d292a1f4fffa1ac5.tar.gz"
|
local -r cni_tar="cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz"
|
||||||
download-or-bust "" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
|
download-or-bust "" "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}"
|
||||||
|
@ -59,7 +59,7 @@ COPY setup-files.sh make-ca-cert.sh copy-addons.sh /
|
|||||||
ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /root/kube/
|
ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /root/kube/
|
||||||
|
|
||||||
# Copy the the cni-bin folder into /opt/cni/bin
|
# Copy the the cni-bin folder into /opt/cni/bin
|
||||||
COPY cni-bin /opt/cni/bin
|
COPY cni-bin/bin /opt/cni/bin
|
||||||
|
|
||||||
# Copy overlay configuration to default directory
|
# Copy overlay configuration to default directory
|
||||||
COPY cni-conf /etc/cni/net.d
|
COPY cni-conf /etc/cni/net.d
|
||||||
|
@ -98,15 +98,8 @@ else
|
|||||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||||
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-${QEMUARCH}-static.tar.xz | tar -xJ -C ${TEMP_DIR}
|
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-${QEMUARCH}-static.tar.xz | tar -xJ -C ${TEMP_DIR}
|
||||||
endif
|
endif
|
||||||
|
# Download CNI
|
||||||
# This cross-compiles cni for all architectures
|
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
|
||||||
# TODO(freehan): Push the latest cni for all arches to storage.googleapis.com so we may just download the binaries
|
|
||||||
docker run -it -v ${TEMP_DIR}/cni-bin:/cnibin golang:1.6 /bin/bash -c "\
|
|
||||||
git clone https://github.com/containernetworking/cni \
|
|
||||||
&& cd cni \
|
|
||||||
&& git checkout $(CNI_RELEASE) \
|
|
||||||
&& GOARCH=$(ARCH) ./build \
|
|
||||||
&& cp bin/* /cnibin"
|
|
||||||
|
|
||||||
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
||||||
rm -rf "${TEMP_DIR}"
|
rm -rf "${TEMP_DIR}"
|
||||||
|
@ -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-8a936732094c0941e1543ef5d292a1f4fffa1ac5.tar.gz
|
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-9d5e6e60e79491207834ae8439e80c943db65a69.tar.gz
|
||||||
- tar_options: v
|
- tar_options: v
|
||||||
- source_hash: md5=ae7ec24d2ffc0fd14a15f527744ba2c3
|
- source_hash: md5=1ac2f8c72244f0188b8ba3d6052f9fc1
|
||||||
- archive_format: tar
|
- archive_format: tar
|
||||||
- if_missing: /opt/cni/bin
|
- if_missing: /opt/cni/bin
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ var sshOptionsMap map[string]string
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
archiveName = "e2e_node_test.tar.gz"
|
archiveName = "e2e_node_test.tar.gz"
|
||||||
CNIRelease = "8a936732094c0941e1543ef5d292a1f4fffa1ac5"
|
CNIRelease = "9d5e6e60e79491207834ae8439e80c943db65a69"
|
||||||
CNIDirectory = "cni"
|
CNIDirectory = "cni"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user