Skip to content

Commit

Permalink
Merge pull request #5019 from thomasferrandiz/backport-1.25-canal-3.26.3
Browse files Browse the repository at this point in the history
[release 1.25] Update canal to v3.26.3
  • Loading branch information
thomasferrandiz authored Nov 15, 2023
2 parents 5142f47 + 6a4ae02 commit f69d249
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion charts/chart_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ charts:
- version: 1.14.200
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.26.1-build2023080200
- version: v3.26.3-build2023110900
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.26.101
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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.26.1-build20230802
${REGISTRY}/rancher/hardened-flannel:v0.22.1-build20230802
${REGISTRY}/rancher/hardened-calico:v3.26.3-build20231109
${REGISTRY}/rancher/hardened-flannel:v0.23.0-build20231109
EOF

if [ "${GOARCH}" != "s390x" ]; then
Expand Down

0 comments on commit f69d249

Please sign in to comment.