Skip to content

Commit

Permalink
Bump flannel version (#6116)
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Buil <[email protected]>
  • Loading branch information
manuelbuil authored Jun 5, 2024
1 parent 16cc106 commit 55a59ed
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ ARG KUBERNETES_VERSION=dev
# windows runtime image
ENV CRICTL_VERSION="v1.29.0"
ENV CALICO_VERSION="v3.27.3"
ENV CNI_PLUGIN_VERSION="v1.4.0"
ENV FLANNEL_VERSION="v0.25.2"
ENV CNI_FLANNEL_VERSION="v1.4.0-flannel1"
ENV CNI_PLUGIN_VERSION="v1.4.1"
ENV FLANNEL_VERSION="v0.25.3"
ENV CNI_FLANNEL_VERSION="v1.4.1-flannel1"

RUN mkdir -p rancher

Expand Down
2 changes: 1 addition & 1 deletion charts/chart_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ charts:
- version: v4.0.205
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.201
- version: v0.25.300
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.7.001
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt
${REGISTRY}/rancher/hardened-flannel:v0.25.2-build20240524
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
${REGISTRY}/rancher/hardened-flannel:v0.25.3-build20240605
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240430
EOF
fi
# Continue to provide a legacy airgap archive set with the default CNI images
Expand Down

0 comments on commit 55a59ed

Please sign in to comment.