Merge pull request #28935 from likel/improve-style

Initialize field with name
Upstream-commit: 209c6a419aac4952bef2fedc8f941130305e6e54
Component: engine

components/engine/daemon/cluster/executor/container/container.go

@@ -584,7 +584,13 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ
 		options.IPAM.Config = append(options.IPAM.Config, c)
 	}
 
-	return clustertypes.NetworkCreateRequest{na.Network.ID, types.NetworkCreateRequest{Name: name, NetworkCreate: options}}, nil
+	return clustertypes.NetworkCreateRequest{
+		ID: na.Network.ID,
+		NetworkCreateRequest: types.NetworkCreateRequest{
+			Name:          name,
+			NetworkCreate: options,
+		},
+	}, nil
 }
 
 func (c containerConfig) eventFilter() filters.Args {

components/engine/daemon/cluster/executor/container/executor.go

@@ -114,8 +114,8 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {
 	}
 
 	return e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
-		na.Network.ID,
-		types.NetworkCreateRequest{
+		ID: na.Network.ID,
+		NetworkCreateRequest: types.NetworkCreateRequest{
 			Name:          na.Network.Spec.Annotations.Name,
 			NetworkCreate: options,
 		},