Merge pull request #5125 from robmry/stack_deploy_service_driver_opts

Handle networks.driver_opts for a service
docker · Jun 7, 2024 · 482bf86 · 482bf86
2 parents a5058b8 + 94f9de5
commit 482bf86
Show file tree

Hide file tree

Showing 11 changed files with 719 additions and 13 deletions.
diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go
@@ -215,16 +215,19 @@ func convertServiceNetworks(
 			return nil, errors.Errorf("undefined network %q", networkName)
 		}
 		var aliases []string
+		var driverOpts map[string]string
 		if network != nil {
 			aliases = network.Aliases
+			driverOpts = network.DriverOpts
 		}
 		target := namespace.Scope(networkName)
 		if networkConfig.Name != "" {
 			target = networkConfig.Name
 		}
 		netAttachConfig := swarm.NetworkAttachmentConfig{
-			Target:  target,
-			Aliases: aliases,
+			Target:     target,
+			Aliases:    aliases,
+			DriverOpts: driverOpts,
 		}
 		// Only add default aliases to user defined networks. Other networks do
 		// not support aliases.

diff --git a/cli/compose/convert/service_test.go b/cli/compose/convert/service_test.go
@@ -240,6 +240,10 @@ func TestConvertServiceNetworks(t *testing.T) {
 	networks := map[string]*composetypes.ServiceNetworkConfig{
 		"front": {
 			Aliases: []string{"something"},
+			DriverOpts: map[string]string{
+				"driver.opt1": "optval1",
+				"driver.opt2": "optval2",
+			},
 		},
 		"back": {
 			Aliases: []string{"other"},
@@ -257,6 +261,10 @@ func TestConvertServiceNetworks(t *testing.T) {
 		{
 			Target:  "fronttier",
 			Aliases: []string{"something", "service"},
+			DriverOpts: map[string]string{
+				"driver.opt1": "optval1",
+				"driver.opt2": "optval2",
+			},
 		},
 	}
 

diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -1,4 +1,4 @@
-version: "3.12"
+version: "3.13"
 
 services:
   foo:
@@ -207,6 +207,9 @@ services:
         aliases:
          - alias1
          - alias3
+        driver_opts:
+          "driveropt1": "optval1"
+          "driveropt2": "optval2"
       other-network:
         ipv4_address: 172.16.238.10
         ipv6_address: 2001:3984:3989::10

diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go
@@ -11,7 +11,7 @@ import (
 
 func fullExampleConfig(workingDir, homeDir string) *types.Config {
 	return &types.Config{
-		Version:  "3.12",
+		Version:  "3.13",
 		Services: services(workingDir, homeDir),
 		Networks: networks(),
 		Volumes:  volumes(),
@@ -190,6 +190,10 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 					Aliases:     []string{"alias1", "alias3"},
 					Ipv4Address: "",
 					Ipv6Address: "",
+					DriverOpts: map[string]string{
+						"driveropt1": "optval1",
+						"driveropt2": "optval2",
+					},
 				},
 				"other-network": {
 					Ipv4Address: "172.16.238.10",

diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go
@@ -184,7 +184,7 @@ func strPtr(val string) *string {
 }
 
 var sampleConfig = types.Config{
-	Version: "3.12",
+	Version: "3.13",
 	Services: []types.ServiceConfig{
 		{
 			Name:        "foo",

diff --git a/cli/compose/loader/testdata/full-example.json.golden b/cli/compose/loader/testdata/full-example.json.golden
@@ -285,7 +285,11 @@
           "aliases": [
             "alias1",
             "alias3"
-          ]
+          ],
+          "driver_opts": {
+            "driveropt1": "optval1",
+            "driveropt2": "optval2"
+          }
         }
       },
       "pid": "host",
@@ -509,7 +513,7 @@
       "working_dir": "/code"
     }
   },
-  "version": "3.12",
+  "version": "3.13",
   "volumes": {
     "another-volume": {
       "name": "user_specified_name",

diff --git a/cli/compose/loader/testdata/full-example.yaml.golden b/cli/compose/loader/testdata/full-example.yaml.golden
@@ -1,4 +1,4 @@
-version: "3.12"
+version: "3.13"
 services:
   foo:
     build:
@@ -152,6 +152,9 @@ services:
         aliases:
         - alias1
         - alias3
+        driver_opts:
+          driveropt1: optval1
+          driveropt2: optval2
     pid: host
     ports:
     - mode: ingress