Merge pull request #107 from rancher/updatecli_master_0b5684aa961215f…

…6d5a4b48a94bf001c85e3add10d303874fd04424d2c6a16f2 Bump flannel version to v0.25.5
rancher · Aug 1, 2024 · 323fd72 · 323fd72
2 parents 1718f0b + 5dbee08
commit 323fd72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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.25.4
+ARG TAG=v0.25.5
 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}

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ TAG ?= ${GITHUB_ACTION_TAG}
 K3S_ROOT_VERSION ?= v0.14.0
 
 ifeq ($(TAG),)
-TAG := v0.25.4$(BUILD_META)
+TAG := v0.25.5$(BUILD_META)
 endif
 
 ifeq (,$(filter %$(BUILD_META),$(TAG)))