maps: add some missing maps to the map sweeping logic

This commit adds some missing BPF maps to the map sweeping logic.

* nat retries (v4 & v6)
* L2 responder (v4 & v6)
* Egress GW policy (v4 & v6)
* SRv6 maps

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

diff --git a/pkg/datapath/maps/map.go b/pkg/datapath/maps/map.go
index 7589d6ab6bb4af528e176529af75cd61b49d9303..90032ecb8f6f6ac3c6e5a326c2199b45e61ddeb3 100644 (file)
--- a/pkg/datapath/maps/map.go
+++ b/pkg/datapath/maps/map.go
@@ -147,6 +147,9 @@ func (ms *MapSweeper) RemoveDisabledMaps() {
                        "cilium_lb6_backends_v2",
                        "cilium_lb6_reverse_sk",
                        "cilium_snat_v6_external",
+                       "cilium_snat_v6_alloc_retries",
+                       "cilium_l2_responder_v6",
+                       "cilium_egress_gw_policy_v6",
                        lbmaps.MaglevOuter6MapName,
                        lbmaps.Affinity6MapName,
                        lbmaps.SourceRange6MapName,
@@ -169,6 +172,9 @@ func (ms *MapSweeper) RemoveDisabledMaps() {
                        "cilium_lb4_backends_v2",
                        "cilium_lb4_reverse_sk",
                        "cilium_snat_v4_external",
+                       "cilium_snat_v4_alloc_retries",
+                       "cilium_l2_responder_v4",
+                       "cilium_egress_gw_policy_v4",
                        lbmaps.MaglevOuter4MapName,
                        lbmaps.Affinity4MapName,
                        lbmaps.SourceRange4MapName,
@@ -180,7 +186,10 @@ func (ms *MapSweeper) RemoveDisabledMaps() {
        }
 
        if !ms.kprCfg.KubeProxyReplacement && !option.Config.EnableBPFMasquerade {
-               maps = append(maps, []string{"cilium_snat_v4_external", "cilium_snat_v6_external"}...)
+               maps = append(maps, []string{
+                       "cilium_snat_v4_external", "cilium_snat_v6_external",
+                       "cilium_snat_v4_alloc_retries", "cilium_snat_v6_alloc_retries",
+               }...)
        }
 
        if !option.Config.EnableIPv4FragmentsTracking {
@@ -212,6 +221,16 @@ func (ms *MapSweeper) RemoveDisabledMaps() {
                maps = append(maps, ipmasq.MapNameIPv6)
        }
 
+       if !option.Config.EnableSRv6 {
+               maps = append(maps,
+                       "cilium_srv6_sid",
+                       "cilium_srv6_policy_v4",
+                       "cilium_srv6_policy_v6",
+                       "cilium_srv6_vrf_v4",
+                       "cilium_srv6_vrf_v6",
+               )
+       }
+
        if !option.Config.EnableXDPPrefilter {
                maps = append(maps, []string{
                        cidrmap.MapName + "v4_dyn",