From a18ff7677d6b084e6cb45de89d5a85988fa03c8d Mon Sep 17 00:00:00 2001
From: Ayoub Nasr <ayoub.nasr@scality.com>
Date: Thu, 17 Oct 2024 10:56:31 +0200
Subject: [PATCH] build, salt: bump calico to 3.28.2

---
 CHANGELOG.md                                     | 3 +++
 buildchain/buildchain/versions.py                | 8 ++++----
 salt/metalk8s/kubernetes/cni/calico/deployed.sls | 5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 444408bd8c..c2dc895a85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@
 - Bump etcd version to [3.5.15](https://github.com/etcd-io/etcd/releases/tag/v3.5.15)
   (PR[#4417](https://github.com/scality/metalk8s/pull/4417))
 
+- Bump Calico version to [3.28.2](https://github.com/projectcalico/calico/releases/tag/v3.28.2)
+  (PR[#4457](https://github.com/scality/metalk8s/pull/4457))
+
 ## Release 128.0.1 (in development)
 
 ## Release 128.0.0
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
index 0f8308bdae..d6cf2f1ff4 100644
--- a/buildchain/buildchain/versions.py
+++ b/buildchain/buildchain/versions.py
@@ -25,7 +25,7 @@
 K8S_SHORT_VERSION: str = f"{K8S_VERSION_MAJOR}.{K8S_VERSION_MINOR}"
 K8S_VERSION: str = f"{K8S_SHORT_VERSION}.{K8S_VERSION_PATCH}"
 
-CALICO_VERSION: str = "3.28.1"
+CALICO_VERSION: str = "3.28.2"
 SALT_VERSION: str = "3002.9"
 CONTAINERD_VERSION: str = "1.6.35"
 
@@ -112,17 +112,17 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     Image(
         name="calico-cni",
         version=_version_prefix(CALICO_VERSION),
-        digest="sha256:e486870cfde8189f9ea145148bc353a2c0fca1f445213274023c1d11df69ae19",
+        digest="sha256:04bd5d80c32a8751f3f4694fef04a50f20c4fed5e4e8b7c7cce752c79702baf3",
     ),
     Image(
         name="calico-node",
         version=_version_prefix(CALICO_VERSION),
-        digest="sha256:d8c644a8a3eee06d88825b9a9fec6e7cd3b7c276d7f90afa8685a79fb300e7e3",
+        digest="sha256:856ac0c261160e7bb967ab43b31598fa89633b33eb2ee292e17384272d929e22",
     ),
     Image(
         name="calico-kube-controllers",
         version=_version_prefix(CALICO_VERSION),
-        digest="sha256:eadb3a25109a5371b7b2dc30d74b2d9b2083eba58abdc034c81f974a48871330",
+        digest="sha256:7de855fcbff8650712de6baad464a9a634e8901e521adff2f04301ad82d7c009",
     ),
     Image(
         name="coredns",
diff --git a/salt/metalk8s/kubernetes/cni/calico/deployed.sls b/salt/metalk8s/kubernetes/cni/calico/deployed.sls
index faf0c1a12f..a374d5a0e0 100644
--- a/salt/metalk8s/kubernetes/cni/calico/deployed.sls
+++ b/salt/metalk8s/kubernetes/cni/calico/deployed.sls
@@ -8,7 +8,7 @@
 # Various changes to the original are made, based on how we deploy Calico (and
 # its CNI plugins etc.) within MetalK8s.
 
-# It comes from: https://github.com/projectcalico/calico/blob/v3.28.0/manifests/calico.yaml
+# It comes from: https://github.com/projectcalico/calico/blob/v3.28.2/manifests/calico.yaml
 
 ---
 # Source: calico/templates/calico-kube-controllers.yaml
@@ -5065,9 +5065,11 @@ spec:
         - name: var-run-calico
           hostPath:
             path: /var/run/calico
+            type: DirectoryOrCreate
         - name: var-lib-calico
           hostPath:
             path: /var/lib/calico
+            type: DirectoryOrCreate
         - name: xtables-lock
           hostPath:
             path: /run/xtables.lock
@@ -5088,6 +5090,7 @@ spec:
         - name: cni-bin-dir
           hostPath:
             path: /opt/cni/bin
+            type: DirectoryOrCreate
         - name: cni-net-dir
           hostPath:
             path: /etc/cni/net.d