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

[Release 1.29] Bump flannel to v0.25.201 and canal to v3.28.0-build2024052800 #6045

Merged
merged 1 commit into from
May 30, 2024
Merged

[Release 1.29] Bump flannel to v0.25.201 and canal to v3.28.0-build2024052800 #6045

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
2 changes: 1 addition & 1 deletion Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev
ENV CRICTL_VERSION="v1.29.0"
ENV CALICO_VERSION="v3.27.3"
ENV CNI_PLUGIN_VERSION="v1.4.0"
ENV FLANNEL_VERSION="v0.25.1"
ENV FLANNEL_VERSION="v0.25.2"
ENV CNI_FLANNEL_VERSION="v1.4.0-flannel1"

RUN mkdir -p rancher
Expand Down
4 changes: 2 additions & 2 deletions charts/chart_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ charts:
- version: 1.15.500
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.27.3-build2024042301
- version: v3.28.0-build2024052800
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.27.300
Expand All @@ -23,7 +23,7 @@ charts:
- version: v4.0.2-build2024020802
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.103
- version: v0.25.201
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.7.001
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
${REGISTRY}/rancher/hardened-calico:v3.27.3-build20240423
${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240423
${REGISTRY}/rancher/hardened-calico:v3.28.0-build20240528
${REGISTRY}/rancher/hardened-flannel:v0.25.2-build20240524
EOF

if [ "${GOARCH}" != "s390x" ]; then
Expand Down Expand Up @@ -101,7 +101,7 @@ 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.1-build20240423
${REGISTRY}/rancher/hardened-flannel:v0.25.2-build20240524
${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
EOF
fi
Expand Down