From 90dfceb941438ec691d7ff5a0785dc0ea7569d29 Mon Sep 17 00:00:00 2001
From: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Date: Wed, 25 Sep 2024 18:28:46 +0200
Subject: [PATCH] Bump Calico v3.28.2

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
---
 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 ec7703ec7a..dcb89eab48 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -44,7 +44,7 @@ ARG KUBERNETES_VERSION=dev
 
 # windows runtime image
 ENV CRICTL_VERSION="v1.29.0"
-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 625d95c585..f5bdd07c27 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 1b0ce94bea..6207493107 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -50,16 +50,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