configmap: register map

To always guarantee the initialization of the config bpf map
before the bpf loader, with this commit, the auth map gets
registered in the map registry.

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

pkg/datapath/cells.go

@@ -18,7 +18,6 @@ import (
 	"github.com/cilium/cilium/pkg/hive/cell"
 	ipcache "github.com/cilium/cilium/pkg/ipcache/types"
 	"github.com/cilium/cilium/pkg/maps"
-	"github.com/cilium/cilium/pkg/maps/configmap"
 	"github.com/cilium/cilium/pkg/option"
 	wg "github.com/cilium/cilium/pkg/wireguard/agent"
 	wgTypes "github.com/cilium/cilium/pkg/wireguard/types"
@@ -33,9 +32,6 @@ var Cell = cell.Module(
 	// Provides all BPF Map which are already provided by via hive cell.
 	maps.Cell,
 
-	// ConfigMap stores runtime configuration state for the Cilium datapath.
-	configmap.Cell,
-
 	// Utime synchronizes utime from userspace to datapath via configmap.Map.
 	utime.Cell,
 

pkg/maps/cells.go

@@ -6,6 +6,7 @@ package maps
 import (
 	"github.com/cilium/cilium/pkg/hive/cell"
 	"github.com/cilium/cilium/pkg/maps/authmap"
+	"github.com/cilium/cilium/pkg/maps/configmap"
 )
 
 // Cell contains all cells which are providing BPF Maps.
@@ -15,4 +16,7 @@ var Cell = cell.Module(
 
 	// Provides the auth.Map which contains the authentication state between Cilium security identities.
 	authmap.Cell,
+
+	// ConfigMap stores runtime configuration state for the Cilium datapath.
+	configmap.Cell,
 )

pkg/maps/configmap/cell.go

@@ -4,6 +4,7 @@
 package configmap
 
 import (
+	"github.com/cilium/cilium/pkg/bpf"
 	"github.com/cilium/cilium/pkg/hive"
 	"github.com/cilium/cilium/pkg/hive/cell"
 )
@@ -14,10 +15,9 @@ var Cell = cell.Module(
 	"eBPF map config contains runtime configuration state for the Cilium datapath",
 
 	cell.Provide(newMap),
-	cell.Invoke(func(Map) {}),
 )
 
-func newMap(lifecycle hive.Lifecycle) Map {
+func newMap(lifecycle hive.Lifecycle) MapOut {
 	configmap := newConfigMap()
 
 	lifecycle.Append(hive.Hook{
@@ -29,5 +29,15 @@ func newMap(lifecycle hive.Lifecycle) Map {
 		},
 	})
 
-	return configmap
+	return MapOut{
+		ConfigMap: configmap,
+		BpfMap:    configmap,
+	}
+}
+
+type MapOut struct {
+	cell.Out
+
+	ConfigMap Map
+	BpfMap    bpf.BpfMap `group:"bpf-maps"`
 }