From 86fc2f528108028ea36cc7687ccc86b7e4e756ff Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Wed, 25 Sep 2024 18:28:46 +0200 Subject: [PATCH] Bump Calico v3.28.2 Signed-off-by: Roberto Bonafiglia --- Dockerfile.windows | 2 +- charts/chart_versions.yaml | 4 ++-- scripts/build-images | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index cb46854951..d7065b8db7 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.28.1" +ENV CALICO_VERSION="v3.28.2" ENV CNI_PLUGIN_VERSION="v1.4.1" ENV FLANNEL_VERSION="v0.25.6" ENV CNI_FLANNEL_VERSION="v1.5.1-flannel2" diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index ed64ff6ad0..4ae309fbc4 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -5,10 +5,10 @@ charts: - version: v3.28.1-build2024091100 filename: /charts/rke2-canal.yaml bootstrap: true - - version: v3.28.100 + - version: v3.28.200 filename: /charts/rke2-calico.yaml bootstrap: true - - version: v3.28.100 + - version: v3.28.200 filename: /charts/rke2-calico-crd.yaml bootstrap: true - version: 1.29.006 diff --git a/scripts/build-images b/scripts/build-images index 8ad4ce49f5..97b3a776cf 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -54,16 +54,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.34.3 - ${REGISTRY}/rancher/mirrored-calico-ctl:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-typha:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-node:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-cni:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-csi:v3.28.1 - ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.28.1 + ${REGISTRY}/rancher/mirrored-calico-operator:v1.34.5 + ${REGISTRY}/rancher/mirrored-calico-ctl:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-typha:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-node:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-cni:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-csi:v3.28.2 + ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.28.2 EOF if [ "${GOARCH}" != "arm64" ]; then