Merge pull request #2827 from neiljerram/bpf-disable-repin

DebugBPFMapRepinEnabled -> false

config/config_params.go

@@ -132,7 +132,7 @@ type Config struct {
 	DebugBPFCgroupV2 string `config:"string;;local"`
 	// DebugBPFMapRepinEnabled can be used to prevent Felix from repinning its BPF maps at startup.  This is useful for
 	// testing with multiple Felix instances running on one host.
-	DebugBPFMapRepinEnabled bool `config:"bool;true;local"`
+	DebugBPFMapRepinEnabled bool `config:"bool;false;local"`
 
 	DatastoreType string `config:"oneof(kubernetes,etcdv3);etcdv3;non-zero,die-on-fail,local"`
 

fv/infrastructure/felix.go

@@ -117,10 +117,6 @@ func RunFelix(infra DatastoreInfra, id int, options TopologyOptions) *Felix {
 			log.Info("FELIX_FV_ENABLE_BPF=true but test manages BPF state itself, not using env var")
 		}
 
-		// Disable map repinning by default since BPF map names are global and we don't want our simulated instances to
-		// share maps.
-		envVars["FELIX_DebugBPFMapRepinEnabled"] = "false"
-
 		if CreateCgroupV2 {
 			envVars["FELIX_DEBUGBPFCGROUPV2"] = containerName
 		}