From fd146ddf832e2ee3491d14e9787d78e502b7c227 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Tue, 5 Mar 2024 19:35:05 +0100 Subject: [PATCH] Update Calico to v3.27.2 Update Canal to v3.27.2 Signed-off-by: Roberto Bonafiglia --- Dockerfile.windows | 2 +- charts/chart_versions.yaml | 4 ++-- scripts/build-images | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index e2d7b1d9c3..96ea828804 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -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" diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 50642297ed..0d2485293d 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -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 diff --git a/scripts/build-images b/scripts/build-images index a0f3ec4300..12f4b682d7 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -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 @@ -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