From bb120e07d56d1314c06aa7dc0f0992e349790c5d Mon Sep 17 00:00:00 2001 From: Ke Li Date: Tue, 29 Nov 2016 19:36:56 +0800 Subject: [PATCH] Initialize field with name Signed-off-by: Ke Li Upstream-commit: da6944ec8747a50941c170186605c8cead517201 Component: engine --- .../engine/daemon/cluster/executor/container/container.go | 8 +++++++- .../engine/daemon/cluster/executor/container/executor.go | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/components/engine/daemon/cluster/executor/container/container.go b/components/engine/daemon/cluster/executor/container/container.go index 112ecf262a..7ec82ae3f8 100644 --- a/components/engine/daemon/cluster/executor/container/container.go +++ b/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 { diff --git a/components/engine/daemon/cluster/executor/container/executor.go b/components/engine/daemon/cluster/executor/container/executor.go index b40d9c2954..86b957b005 100644 --- a/components/engine/daemon/cluster/executor/container/executor.go +++ b/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, },