libnetwork: provide endpoint name for IPAM drivers

olljanat · olljanat · commit f4a72b8e3f23 · 2025-08-12T19:51:43.000Z
Signed-off-by: Olli Janatuinen &lt;olli.janatuinen@gmail.com&gt;
diff --git a/daemon/libnetwork/libnetwork_internal_test.go b/daemon/libnetwork/libnetwork_internal_test.go
@@ -747,7 +747,7 @@ func TestIpamReleaseOnNetDriverFailures(t *testing.T) {
 	}
 
 	// Now create good bridge network with different gateway
-	ipamOpt2 := NetworkOptionIpam(defaultipam.DriverName, "", []*IpamConf{{PreferredPool: "10.35.0.0/16", Gateway: "10.35.255.253"}}, nil, nil)
+	ipamOpt2 := NetworkOptionIpam(defaultipam.DriverName, "", []*IpamConf{{PreferredPool: "10.35.0.0/16", Gateway: "10.35.255.253"}}, nil, map[string]string{"example": "option"})
 	gnw, err = c.NewNetwork(context.Background(), "bridge", "goodnet2", "",
 		NetworkOptionEnableIPv4(true),
 		ipamOpt2,
@@ -765,6 +765,10 @@ func TestIpamReleaseOnNetDriverFailures(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+
+	// Verify that "netlabel.EndpointName" was added to ipamOptions
+	assert.Check(t, is.Equal(ep.ipamOptions[netlabel.EndpointName], "ep1"), "got: %s; expected: ep1", ep.ipamOptions[netlabel.EndpointName])
+
 	defer ep.Delete(context.Background(), false) //nolint:errcheck
 
 	expectedIP, _ := types.ParseCIDR("10.35.0.1/16")
diff --git a/daemon/libnetwork/netlabel/labels.go b/daemon/libnetwork/netlabel/labels.go
@@ -26,6 +26,9 @@ const (
 	// DNSServers A list of DNS servers associated with the endpoint
 	DNSServers = Prefix + ".endpoint.dnsservers"
 
+	// EndpointName constant represents the container's Name
+	EndpointName = Prefix + ".endpoint.name"
+
 	// EndpointSysctls is a comma separated list interface-specific sysctls
 	// where the interface name is represented by the string "IFNAME".
 	EndpointSysctls = Prefix + ".endpoint.sysctls"
diff --git a/daemon/libnetwork/network.go b/daemon/libnetwork/network.go
@@ -1185,7 +1185,14 @@ func (n *Network) CreateEndpoint(ctx context.Context, name string, options ...En
 func (n *Network) createEndpoint(ctx context.Context, name string, options ...EndpointOption) (*Endpoint, error) {
 	var err error
 
-	ep := &Endpoint{name: name, generic: make(map[string]any), iface: &EndpointInterface{}}
+	ep := &Endpoint{
+		name:    name,
+		generic: make(map[string]any),
+		iface:   &EndpointInterface{},
+		ipamOptions: map[string]string{
+			netlabel.EndpointName: name,
+		},
+	}
 	ep.id = stringid.GenerateRandomID()
 
 	// Initialize ep.network with a possibly stale copy of n. We need this to get network from
@@ -1221,9 +1228,6 @@ func (n *Network) createEndpoint(ctx context.Context, name string, options ...En
 		if ep.iface.mac == nil {
 			ep.iface.mac = netutils.GenerateRandomMAC()
 		}
-		if ep.ipamOptions == nil {
-			ep.ipamOptions = make(map[string]string)
-		}
 		ep.ipamOptions[netlabel.MacAddress] = ep.iface.mac.String()
 	}
 
