Skip to content

Commit

Permalink
Merge pull request #125 from rancher/updatecli_master_0b5684aa961215f…
Browse files Browse the repository at this point in the history
…6d5a4b48a94bf001c85e3add10d303874fd04424d2c6a16f2

Bump flannel version to v0.26.2
  • Loading branch information
thomasferrandiz authored Dec 12, 2024
2 parents 9835430 + 43b76b8 commit 4e7ef3e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
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
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

0 comments on commit 4e7ef3e

Please sign in to comment.