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.26] Update Calico and Canal to v3.27.2 #5585

Merged
merged 1 commit into from
Mar 8, 2024
Merged

[Release 1.26] Update Calico and Canal to v3.27.2 #5585

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 @@ -44,7 +44,7 @@ ARG KUBERNETES_VERSION=dev

# windows runtime image
ENV CRICTL_VERSION="v1.26.0"
ENV CALICO_VERSION="v3.27.0"
ENV CALICO_VERSION="v3.27.2"
ENV CNI_PLUGIN_VERSION="v1.4.0"
ENV FLANNEL_VERSION="v0.24.2"
ENV CNI_FLANNEL_VERSION="v1.4.0-flannel1"
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,10 +2,10 @@ charts:
- version: 1.15.100
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.27.0-build2024020601
- version: v3.27.2-build2024030800
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.27.002
- version: v3.27.200
filename: /charts/rke2-calico.yaml
bootstrap: true
- version: v3.27.002
Expand Down
22 changes: 12 additions & 10 deletions scripts/build-images
View file
Open in desktop
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.27.0-build20240206
${REGISTRY}/rancher/hardened-flannel:v0.24.2-build20240122
${REGISTRY}/rancher/hardened-calico:v3.27.2-build20240308
${REGISTRY}/rancher/hardened-flannel:v0.24.3-build20240307
EOF

if [ "${GOARCH}" != "s390x" ]; then
Expand All @@ -49,14 +49,16 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
${REGISTRY}/rancher/mirrored-calico-operator:v1.32.3
${REGISTRY}/rancher/mirrored-calico-ctl:v3.27.0
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.27.0
${REGISTRY}/rancher/mirrored-calico-typha:v3.27.0
${REGISTRY}/rancher/mirrored-calico-node:v3.27.0
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0
${REGISTRY}/rancher/mirrored-calico-cni:v3.27.0
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.27.0
${REGISTRY}/rancher/mirrored-calico-operator:v1.32.5
${REGISTRY}/rancher/mirrored-calico-ctl:v3.27.2
${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.27.2
${REGISTRY}/rancher/mirrored-calico-typha:v3.27.2
${REGISTRY}/rancher/mirrored-calico-node:v3.27.2
${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.27.2
${REGISTRY}/rancher/mirrored-calico-cni:v3.27.2
${REGISTRY}/rancher/mirrored-calico-apiserver:v3.27.2
${REGISTRY}/rancher/mirrored-calico-csi:v3.27.2
${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.27.2
EOF

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