remove network mode (#301)

Author: tonicmuroq

cluster/calcium/create.go

@@ -335,7 +335,6 @@ func (c *Calcium) doMakeWorkloadOptions(no int, msg *types.CreateWorkloadMessage
 	config.Volumes = msg.VolumeLimit.ApplyPlan(msg.VolumePlanLimit).ToStringSlice(false, true)
 	config.VolumePlan = msg.VolumePlanLimit.ToLiteral()
 	config.Debug = opts.Debug
-	config.Network = opts.NetworkMode
 	config.Networks = opts.Networks
 
 	// entry

cluster/calcium/replace.go

@@ -18,9 +18,7 @@ func (c *Calcium) ReplaceWorkload(ctx context.Context, opts *types.ReplaceOption
 	if err := opts.Validate(); err != nil {
 		return nil, err
 	}
-	if opts.Count == 0 {
-		opts.Count = 1
-	}
+	opts.Normalize()
 	if len(opts.IDs) == 0 {
 		if len(opts.Nodenames) == 0 {
 			opts.Nodenames = []string{""}
@@ -83,7 +81,6 @@ func (c *Calcium) ReplaceWorkload(ctx context.Context, opts *types.ReplaceOption
 								fmt.Sprintf("workload %s is not running, can not inherit", workload.ID),
 							)
 						}
-						replaceOpts.NetworkMode = ""
 						replaceOpts.Networks = info.Networks
 						log.Infof("[ReplaceWorkload] Inherit old workload network configuration mode %v", replaceOpts.Networks)
 					}

engine/docker/container.go

@@ -59,10 +59,13 @@ func (e *Engine) VirtualizationCreate(ctx context.Context, opts *enginetypes.Vir
 	if opts.RestartPolicy == restartAlways {
 		restartRetryCount = 0
 	}
+	// no longer use opts.Network as networkmode
+	// always get network name from networks
+	// -----------------------------------------
 	// network mode 和 networks 互斥
 	// 没有 networks 的时候用 networkmode 的值
 	// 有 networks 的时候一律用用 networks 的值作为 mode
-	networkMode := dockercontainer.NetworkMode(opts.Network)
+	var networkMode dockercontainer.NetworkMode
 	for name := range opts.Networks {
 		networkMode = dockercontainer.NetworkMode(name)
 		if networkMode.IsHost() {

engine/systemd/unit.go

@@ -86,7 +86,7 @@ func (b *unitBuilder) buildNetworkLimit() *unitBuilder {
 		return b
 	}
 
-	network := b.opts.Network
+	network := ""
 	for net := range b.opts.Networks {
 		if net != "" {
 			network = net

engine/types/virtualization.go

@@ -33,7 +33,6 @@ type VirtualizationCreateOptions struct {
 
 	RestartPolicy string
 
-	Network  string
 	Networks map[string]string
 
 	Volumes []string

go.mod

@@ -43,5 +43,6 @@ require (
 	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
 	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
 	google.golang.org/grpc v1.28.0
+	google.golang.org/protobuf v1.23.0
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
 )