From a925b4e097ef574eb44dd7f350366cbebefa3355 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 6 Feb 2025 20:14:14 -0700 Subject: [PATCH 1/2] Update to calico `v3.29.2` Signed-off-by: Michael Fritch (cherry picked from commit 9fee5d7e6424728d7488f5bda5538e1d1cae8912) --- Dockerfile.windows | 2 +- charts/chart_versions.yaml | 2 +- scripts/build-images | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index 3db4e5f183..adc9bd122d 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -44,7 +44,7 @@ ARG KUBERNETES_VERSION=dev # windows runtime image ENV CRICTL_VERSION="v1.30.1" -ENV CALICO_VERSION="v3.29.1" +ENV CALICO_VERSION="v3.29.2" ENV CNI_PLUGIN_VERSION="v1.6.2" ENV FLANNEL_VERSION="v0.26.4" ENV CNI_FLANNEL_VERSION="v1.6.2-flannel1" diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index 2b21dea6b8..d6f5cd1629 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -5,7 +5,7 @@ charts: - version: v3.29.1-build2025020600 filename: /charts/rke2-canal.yaml bootstrap: true - - version: v3.29.101 + - version: v3.29.200 filename: /charts/rke2-calico.yaml bootstrap: true - version: v3.29.101 diff --git a/scripts/build-images b/scripts/build-images index 30c28d784e..0741f42ef6 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -53,16 +53,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.36.2 - ${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-typha:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-node:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-cni:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-csi:v3.29.1 - ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.1 + ${REGISTRY}/rancher/mirrored-calico-operator:v1.36.5 + ${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-typha:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-node:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-cni:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-csi:v3.29.2 + ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.2 EOF if [ "${GOARCH}" != "arm64" ]; then From 3afd336ad568e07b6cf42bbb09fe771ce953aafc Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 6 Feb 2025 20:14:33 -0700 Subject: [PATCH 2/2] Update to canal `v3.29.2-build20250206` Signed-off-by: Michael Fritch (cherry picked from commit 262ec7f3756ef9d99d057ed649042469e845765e) --- charts/chart_versions.yaml | 2 +- scripts/build-images | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index d6f5cd1629..d0427c6505 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -2,7 +2,7 @@ charts: - version: 1.17.000 filename: /charts/rke2-cilium.yaml bootstrap: true - - version: v3.29.1-build2025020600 + - version: v3.29.2-build2025020600 filename: /charts/rke2-canal.yaml bootstrap: true - version: v3.29.200 diff --git a/scripts/build-images b/scripts/build-images index 0741f42ef6..8190d1be33 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -33,7 +33,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt - ${REGISTRY}/rancher/hardened-calico:v3.29.1-build20250206 + ${REGISTRY}/rancher/hardened-calico:v3.29.2-build20250206 ${REGISTRY}/rancher/hardened-flannel:v0.26.4-build20250206 EOF