1. docker
  2. Commit da6944ec8747a50941c170186605c8cead517201
Browse code

Initialize field with name

Signed-off-by: Ke Li <kel@splunk.com>

Ke Li authored on 2016/11/29 20:36:56
Showing 2 changed files
daemon/cluster/executor/container/container.go
History View file @ da6944e
... ... 
@@ -584,7 +584,13 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ
584 584 
 		options.IPAM.Config = append(options.IPAM.Config, c)
585 585 
 	}
586 586
587 
-	return clustertypes.NetworkCreateRequest{na.Network.ID, types.NetworkCreateRequest{Name: name, NetworkCreate: options}}, nil
587 
+	return clustertypes.NetworkCreateRequest{
588 
+		ID: na.Network.ID,
589 
+		NetworkCreateRequest: types.NetworkCreateRequest{
590 
+			Name:          name,
591 
+			NetworkCreate: options,
592 
+		},
593 
+	}, nil
588 594 
 }
589 595
590 596 
 func (c containerConfig) eventFilter() filters.Args {
daemon/cluster/executor/container/executor.go
History View file @ da6944e
... ... 
@@ -114,8 +114,8 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {
114 114 
 	}
115 115
116 116 
 	return e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
117 
-		na.Network.ID,
118 
-		types.NetworkCreateRequest{
117 
+		ID: na.Network.ID,
118 
+		NetworkCreateRequest: types.NetworkCreateRequest{
119 119 
 			Name:          na.Network.Spec.Annotations.Name,
120 120 
 			NetworkCreate: options,
121 121 
 		},