diff --git a/CHANGES.md b/CHANGES.md index edda3ee..3915f9d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,9 @@ Notable changes between versions ## Latest +* Update CNI plugins from v0.9.1 to v1.5.1 +* Drop flannel plugin from image since upstream doesn't publish arm64 + ## v0.4.2 * Update CNI plugins from v0.8.7 to v0.9.1 ([#4](https://github.com/poseidon/flannel-cni/pull/4), [#5](https://github.com/poseidon/flannel-cni/pull/5)) diff --git a/Dockerfile b/Dockerfile index 930ea03..2b4c4f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ LABEL maintainer="Dalton Hubble " LABEL org.opencontainers.image.title="flannel-cni", LABEL org.opencontainers.image.source="https://github.com/poseidon/flannel-cni" LABEL org.opencontainers.image.vendor="Poseidon Labs" -COPY --from=builder /bin/flannel /opt/cni/bin/flannel COPY --from=builder /bin/loopback /opt/cni/bin/loopback COPY --from=builder /bin/bridge /opt/cni/bin/bridge COPY --from=builder /bin/host-local /opt/cni/bin/host-local diff --git a/Makefile b/Makefile index 2b84943..5ce742b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION=$(shell git describe --tags --match=v* --always --dirty) -CNI_VERSION=v0.9.1 +CNI_VERSION=v1.5.1 LOCAL_REPO?=poseidon/flannel-cni IMAGE_REPO?=quay.io/poseidon/flannel-cni diff --git a/scripts/fetch-cni.sh b/scripts/fetch-cni.sh index bb84553..a9fa044 100755 --- a/scripts/fetch-cni.sh +++ b/scripts/fetch-cni.sh @@ -7,5 +7,5 @@ set -ex apk --no-cache add curl echo "Download CNI plugins ${CNI_VERSION} for ${ARCH}" -curl -sSfL https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C bin/ ./flannel ./loopback ./bridge ./host-local ./portmap ./tuning ./bandwidth +curl -sSfL https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C bin/ ./loopback ./bridge ./host-local ./portmap ./tuning ./bandwidth