From 9a2bfb8e1c6a00de046937f158f6073577c335bb Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Tue, 23 Apr 2024 18:11:11 +0200 Subject: [PATCH] Updated Calico and Flannel to fix ARM64 build Signed-off-by: Roberto Bonafiglia --- charts/chart_versions.yaml | 7 +++++-- scripts/build-images | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index e901e171db..01731bf1c2 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -2,9 +2,12 @@ charts: - version: 1.15.400 filename: /charts/rke2-cilium.yaml bootstrap: true - - version: v3.27.3-build2024040300 + - version: v3.27.3-build2024042300 filename: /charts/rke2-canal.yaml bootstrap: true + - version: v3.27.3-build2024042300 + filename: /charts/rke2-canal-crd.yaml + bootstrap: true - version: v3.27.300 filename: /charts/rke2-calico.yaml bootstrap: true @@ -23,7 +26,7 @@ charts: - version: v4.0.2-build2024020802 filename: /charts/rke2-multus.yaml bootstrap: true - - version: v0.25.100 + - version: v0.25.101 filename: /charts/rke2-flannel.yaml bootstrap: true - version: 1.7.001 diff --git a/scripts/build-images b/scripts/build-images index a8e58f23f6..94f1361326 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -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-build20240403 - ${REGISTRY}/rancher/hardened-flannel:v0.25.0-build20240410 + ${REGISTRY}/rancher/hardened-calico:v3.27.3-build20240423 + ${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240423 EOF if [ "${GOARCH}" != "s390x" ]; then @@ -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-build20240412 + ${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240423 ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325 EOF fi