Revert "BPF Host Routing: do not skip fib lookups on EKS"

This reverts commit f40efb58a8084bc39097f13a994daa28f63b52b6.

Runtime device detection is now enabled by default.

Signed-off-by: Aditi Ghag <aditi@cilium.io>

diff --git a/pkg/datapath/linux/config/config.go b/pkg/datapath/linux/config/config.go
index db6b89f168f6cb38e58ca6e2cc5ccd31bdda526b..df5bfebfa6dcd9cf94a0cd8e8fd20a5d59982bee 100644 (file)
--- a/pkg/datapath/linux/config/config.go
+++ b/pkg/datapath/linux/config/config.go
@@ -815,9 +815,7 @@ func (h *HeaderfileWriter) writeTemplateConfig(fw *bufio.Writer, devices []strin
        }
 
        if !option.Config.EnableHostLegacyRouting && drd != nil && len(devices) == 1 {
-               if e.IsHost() || !option.Config.EnforceLXCFibLookup() {
-                       fmt.Fprintf(fw, "#define ENABLE_SKIP_FIB 1\n")
-               }
+               fmt.Fprintf(fw, "#define ENABLE_SKIP_FIB 1\n")
        }
 
        if e.IsHost() {

diff --git a/pkg/option/config.go b/pkg/option/config.go
index 537db9b3be33f3dce302c6eb9dffe25d3c925f87..a8280902a13c3b522b1657fe2e7325e6eb6c1b01 100644 (file)
--- a/pkg/option/config.go
+++ b/pkg/option/config.go
@@ -3549,16 +3549,6 @@ func parseBPFMapEventConfigs(confs BPFEventBufferConfigs, confMap map[string]str
        return nil
 }
 
-func (d *DaemonConfig) EnforceLXCFibLookup() bool {
-       // See https://github.com/cilium/cilium/issues/27343 for the symptoms.
-       //
-       // We want to enforce FIB lookup if EndpointRoutes are enabled, because
-       // this was a config dependency change which caused different behaviour
-       // since v1.14.0-snapshot.2. We will remove this hack later, once we
-       // have auto-device detection on by default.
-       return d.EnableEndpointRoutes
-}
-
 func (d *DaemonConfig) GetZone(id uint8) string {
        return d.ReverseFixedZoneMapping[id]
 }