diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1bc91b..045d3e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,7 @@ env: DOCKER_VERSION: "29.2.0" NERDCTL_VERSION: "2.2.1" FLANNEL_VERSION: "1.9.0-flannel1" + FLANNEL_MINI_VERSION: "1.9.0" BINFMT_VERSION: "deploy/v7.0.0-28" BINFMT_QEMU_VERSION: "7.0.0" diff --git a/Makefile b/Makefile index ffc16e9..3a09f95 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ DOCKER_VERSION=29.2.0 # containerd dependency NERDCTL_VERSION ?= 2.2.1 FLANNEL_VERSION ?= 1.9.0-flannel1 +FLANNEL_MINI_VERSION ?= 1.9.0 # architecture defaults to the current system's. OS_ARCH ?= $(shell uname -m) @@ -49,7 +50,7 @@ binfmt: ARCH=$(ARCH) BINFMT_ARCH=$(BINFMT_ARCH) BINFMT_VERSION=$(BINFMT_VERSION) BINFMT_QEMU_VERSION=$(BINFMT_QEMU_VERSION) scripts/binfmt.sh containerd: - ARCH=$(ARCH) NERDCTL_VERSION=$(NERDCTL_VERSION) FLANNEL_VERSION=$(FLANNEL_VERSION) RUNTIME=$(RUNTIME) scripts/containerd.sh + ARCH=$(ARCH) NERDCTL_VERSION=$(NERDCTL_VERSION) FLANNEL_VERSION=$(FLANNEL_VERSION) FLANNEL_MINI_VERSION=$(FLANNEL_MINI_VERSION) RUNTIME=$(RUNTIME) scripts/containerd.sh qcow: cloud-image binfmt containerd ARCH=$(ARCH) BINFMT_ARCH=$(BINFMT_ARCH) UBUNTU_VERSION=$(UBUNTU_VERSION) DOCKER_VERSION=$(DOCKER_VERSION) RUNTIME=$(RUNTIME) scripts/qcow.docker.sh diff --git a/scripts/containerd.sh b/scripts/containerd.sh index 6a6db7a..5e467bc 100755 --- a/scripts/containerd.sh +++ b/scripts/containerd.sh @@ -29,7 +29,7 @@ download_containerd() ( download_flannel() ( # download archive - FILE="cni-plugin-flannel-linux-${1}-v${FLANNEL_VERSION}.tgz" + FILE="cni-plugin-flannel-linux-${1}-v${FLANNEL_MINI_VERSION}.tgz" URL="https://github.com/flannel-io/cni-plugin/releases/download/v${FLANNEL_VERSION}/${FILE}" curl -LO $URL