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.

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] Update Flannel and Canal version #7408

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions charts/chart_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ charts:
- version: 1.16.303
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.29.0-build2024110400
- version: v3.29.1-build2024121100
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.29.100
Expand All @@ -23,7 +23,7 @@ charts:
- version: v4.1.301
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.26.100
- version: v0.26.101
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.9.100
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-images
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.29.0-build20241104
${REGISTRY}/rancher/hardened-flannel:v0.26.0-build20241024
${REGISTRY}/rancher/hardened-calico:v3.29.1-build20241211
${REGISTRY}/rancher/hardened-flannel:v0.26.1-build20241211
EOF

if [ "${GOARCH}" != "s390x" ]; then
Expand Down Expand Up @@ -94,7 +94,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.26.1-build20241107
${REGISTRY}/rancher/hardened-flannel:v0.26.1-build20241211
${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
EOF
fi
Expand Down
Loading