Skip to content
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

Bump flannel version to v0.26.2 #125

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Bump flannel version to v0.26.2 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfefd3e
chore: Bump to latest flannel version in Dockerfile
github-actions[bot] Dec 12, 2024
43b76b8
chore: Bump to latest flannel version in Makefile
github-actions[bot] Dec 12, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN mkdir -p /opt/xtables/
RUN export ARCH=$(xx-info arch) &&\
wget https://github.com/rancher/k3s-root/releases/download/${K3S_ROOT_VERSION}/k3s-root-xtables-${ARCH}.tar -O /opt/xtables/k3s-root-xtables.tar
RUN tar xvf /opt/xtables/k3s-root-xtables.tar -C /opt/xtables
ARG TAG=v0.26.1
ARG TAG=v0.26.2
ARG PKG="github.com/flannel-io/flannel"
ARG SRC="github.com/flannel-io/flannel"
RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TAG ?= ${GITHUB_ACTION_TAG}
K3S_ROOT_VERSION ?= v0.14.1

ifeq ($(TAG),)
TAG := v0.26.1$(BUILD_META)
TAG := v0.26.2$(BUILD_META)
endif

ifeq (,$(filter %$(BUILD_META),$(TAG)))
Expand Down