From a7c108d9c704ac93f3c6eb6fca21c491ae5fb031 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Fri, 9 Feb 2024 15:35:28 +0100 Subject: [PATCH] Update canal version Signed-off-by: Roberto Bonafiglia --- charts/chart_versions.yaml | 2 +- scripts/build-images | 4 ++-- scripts/validate | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 9d7c2dcc65..251e7a8024 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -2,7 +2,7 @@ charts: - version: 1.14.400 filename: /charts/rke2-cilium.yaml bootstrap: true - - version: v3.26.3-build2023110900 + - version: v3.27.0-build2024020601 filename: /charts/rke2-canal.yaml bootstrap: true - version: v3.26.300 diff --git a/scripts/build-images b/scripts/build-images index af2b99b783..4bbe7de391 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.26.3-build20231109 - ${REGISTRY}/rancher/hardened-flannel:v0.23.0-build20231109 + ${REGISTRY}/rancher/hardened-calico:v3.27.0-build20240206 + ${REGISTRY}/rancher/hardened-flannel:v0.24.2-build20240122 EOF if [ "${GOARCH}" != "s390x" ]; then diff --git a/scripts/validate b/scripts/validate index d9f829fe9b..50b3d7606c 100755 --- a/scripts/validate +++ b/scripts/validate @@ -22,7 +22,7 @@ function check_win_binaries() { #fi CALICO_WINDOWS_VERSION=$(grep 'CALICO_VERSION=' Dockerfile.windows | cut -d '=' -f 2- | grep -oE "v([0-9]+)\.([0-9]+)") - CALICO_LINUX_VERSION=$(yq '.charts[] | select(.filename == "/charts/rke2-canal.yaml").version' charts/chart_versions.yaml | cut -d ',' -f 1- | grep -oE "v([0-9]+)\.([0-9]+)") + CALICO_LINUX_VERSION=$(yq '.charts[] | select(.filename == "/charts/rke2-calico.yaml").version' charts/chart_versions.yaml | cut -d ',' -f 1- | grep -oE "v([0-9]+)\.([0-9]+)") if [ ! "$CALICO_WINDOWS_VERSION" = "$CALICO_LINUX_VERSION" ]; then fatal "Calico windows binary version [$CALICO_WINDOWS_VERSION] does not match Calico chart version [$CALICO_LINUX_VERSION]" fi