Skip to content

Fix flannel version format changes. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abiosoft merged 1 commit into from
Jan 31, 2026
Merged

Fix flannel version format changes. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/containerd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down