Pass IPAM options when creating networks

Signed-off-by: Ousama Ben Younes <benyounes.ousama@gmail.com>
ousamabenyounes · Jul 11, 2026 · Jul 16, 2026 · Aug 16, 2026 · 939c4bbf304ae9904ab8d0a618703fc872ec14c9
commit 939c4bbf304ae9904ab8d0a618703fc872ec14c9
@@ -1410,14 +1410,18 @@ func (s *composeService) createNetwork(ctx context.Context, n *types.NetworkConf
 		EnableIPv4: n.EnableIPv4,
 	}
 
-	if n.Ipam.Driver != "" || len(n.Ipam.Config) > 0 {
+	if n.Ipam.Driver != "" || len(n.Ipam.Config) > 0 || len(n.Ipam.Options) > 0 {
 		createOpts.IPAM = &network.IPAM{}
 	}
 
 	if n.Ipam.Driver != "" {
 		createOpts.IPAM.Driver = n.Ipam.Driver
 	}
 
+	if len(n.Ipam.Options) > 0 {
+		createOpts.IPAM.Options = n.Ipam.Options
+	}
+
 	for _, ipamConfig := range n.Ipam.Config {
 		c, err := parseIPAMPool(ipamConfig)
 		if err != nil {

@@ -24,6 +24,7 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/api/types/network"
 	"github.com/moby/moby/client"
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
@@ -39,6 +40,15 @@ func (noopEventProcessor) Start(_ context.Context, _ string) {}
 func (noopEventProcessor) On(_ ...api.Resource)              {}
 func (noopEventProcessor) Done(_ string, _ bool)             {}
 
+const (
+	ipamOptionsProjectName  = "test"
+	ipamOptionsNetworkKey   = "default"
+	ipamOptionsNetworkName  = "test_default"
+	ipamOptionsKey          = "test"
+	ipamOptionsValue        = "1"
+	ipamOptionsCreatedNetID = "net1"
+)
+
 func newTestService(t *testing.T) (*composeService, *mocks.MockAPIClient) {
 	t.Helper()
 	mockCtrl := gomock.NewController(t)
@@ -84,6 +94,49 @@ func TestExecutePlanCreateNetwork(t *testing.T) {
 	assert.NilError(t, err)
 }
 
+func TestExecutePlanCreateNetworkWithIPAMOptions(t *testing.T) {
+	svc, apiClient := newTestService(t)
+
+	nw := types.NetworkConfig{
+		Name: ipamOptionsNetworkName,
+		Ipam: types.IPAMConfig{
+			Options: types.Options{
+				ipamOptionsKey: ipamOptionsValue,
+			},
+		},
+	}
+	project := &types.Project{
+		Name:     ipamOptionsProjectName,
+		Networks: types.Networks{ipamOptionsNetworkKey: nw},
+	}
+
+	apiClient.EXPECT().NetworkInspect(gomock.Any(), ipamOptionsNetworkName, gomock.Any()).
+		Return(client.NetworkInspectResult{}, notFoundError{})
+	apiClient.EXPECT().NetworkList(gomock.Any(), gomock.Any()).
+		Return(client.NetworkListResult{}, nil)
+	apiClient.EXPECT().NetworkCreate(gomock.Any(), ipamOptionsNetworkName, gomock.Any()).
+		DoAndReturn(func(_ context.Context, _ string, opts client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
+			assert.DeepEqual(t, opts.IPAM, &network.IPAM{
+				Options: map[string]string{
+					ipamOptionsKey: ipamOptionsValue,
+				},
+			})
+			return client.NetworkCreateResult{ID: ipamOptionsCreatedNetID}, nil
+		})
+
+	plan := &Plan{}
+	plan.addNode(Operation{
+		Type:       OpCreateNetwork,
+		ResourceID: "network:" + ipamOptionsNetworkKey,
+		Cause:      "not found",
+		Name:       nw.Name,
+		Network:    &nw,
+	}, "")
+
+	err := svc.executePlan(t.Context(), project, emptyObservedState(ipamOptionsProjectName), plan)
+	assert.NilError(t, err)
+}
+
 func TestExecutePlanStopRemoveContainer(t *testing.T) {
 	svc, apiClient := newTestService(t)