Move endpoint_mode under deploy and add it to the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

compose/convert/service.go

@@ -55,7 +55,7 @@ func convertService(
 ) (swarm.ServiceSpec, error) {
 	name := namespace.Scope(service.Name)
 
-	endpoint, err := convertEndpointSpec(service.EndpointMode, service.Ports)
+	endpoint, err := convertEndpointSpec(service.Deploy.EndpointMode, service.Ports)
 	if err != nil {
 		return swarm.ServiceSpec{}, err
 	}

compose/schema/data/config_schema_v3.1.json

@@ -293,6 +293,7 @@
       "type": ["object", "null"],
       "properties": {
         "mode": {"type": "string"},
+        "endpoint_mode": {"type": "string"},
         "replicas": {"type": "integer"},
         "labels": {"$ref": "#/definitions/list_or_dict"},
         "update_config": {

compose/types/types.go

@@ -89,7 +89,6 @@ type ServiceConfig struct {
 	DNS             StringList
 	DNSSearch       StringList `mapstructure:"dns_search"`
 	DomainName      string     `mapstructure:"domainname"`
-	EndpointMode    string
 	Entrypoint      ShellCommand
 	Environment     MappingWithEquals
 	EnvFile         StringList `mapstructure:"env_file"`
@@ -157,6 +156,7 @@ type DeployConfig struct {
 	Resources     Resources
 	RestartPolicy *RestartPolicy `mapstructure:"restart_policy"`
 	Placement     Placement
+	EndpointMode  string
 }
 
 // HealthCheckConfig the healthcheck configuration for a service