Add a "defaultPortMapping" option which exposes all Mesos provided ports

Docs/reference/configuration.md

@@ -21,6 +21,7 @@ Singularity (Service) is configured by DropWizard via a YAML file referenced on
     - [Resource Limits](#resource-limits)
     - [Racks](#racks)
     - [Slaves](#slaves)
+  - [Network Configuration](#network-configuration)
   - [Database](#database)
     - [History Purging](#history-purging)
   - [S3](#s3)
@@ -192,6 +193,14 @@ These settings should live under the "mesos" field inside the root configuration
 |-----------|---------|-------------|------|
 | database | | The database connection for SingularityService follows the [dropwizard DataSourceFactory format](http://www.dropwizard.io/0.7.0/dropwizard-db/apidocs/io/dropwizard/db/DataSourceFactory.html) | [DataSourceFactory](http://www.dropwizard.io/0.7.0/dropwizard-db/apidocs/io/dropwizard/db/DataSourceFactory.html) |
 
+## Network Configuration
+
+These settings should live under the "network" field of the root configuration.
+
+| Parameter | Default | Description | Type |
+|-----------|---------|-------------|------|
+| defaultPortMapping | false | If no port mapping is provided, map all Mesos-provided ports to the host | boolean |
+
 #### History Purging ####
 
 These settings live under the "historyPuring" field in the root configuration
@@ -232,7 +241,7 @@ These settings live under the "sentry" field in the root config and enable Singu
 
 ## SMTP ##
 
-These settings live under the "smtp" field in teh root config.
+These settings live under the "smtp" field in the root config.
 
 | Parameter | Default | Description | Type |
 |-----------|---------|-------------|------|

SingularityService/src/main/java/com/hubspot/singularity/config/NetworkConfiguration.java

@@ -0,0 +1,18 @@
+package com.hubspot.singularity.config;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties( ignoreUnknown = true )
+public class NetworkConfiguration {
+  private boolean defaultPortMapping;
+
+  public void setDefaultPortMapping(boolean defaultPortMapping)
+  {
+    this.defaultPortMapping = defaultPortMapping;
+  }
+
+  public boolean isDefaultPortMapping()
+  {
+    return defaultPortMapping;
+  }
+}

SingularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java

@@ -169,6 +169,10 @@ public class SingularityConfiguration extends Configuration {
   @Valid
   private MesosConfiguration mesosConfiguration;
 
+  @JsonProperty("network")
+  @Valid
+  private NetworkConfiguration networkConfiguration = new NetworkConfiguration();
+
   private int newTaskCheckerBaseDelaySeconds = 1;
 
   private long pendingDeployHoldTaskDuringDecommissionMillis = TimeUnit.MINUTES.toMillis(10);
@@ -523,6 +527,10 @@ public MesosConfiguration getMesosConfiguration() {
     return mesosConfiguration;
   }
 
+  public NetworkConfiguration getNetworkConfiguration() {
+    return networkConfiguration;
+  }
+
   public int getNewTaskCheckerBaseDelaySeconds() {
     return newTaskCheckerBaseDelaySeconds;
   }
@@ -843,6 +851,10 @@ public void setMesosConfiguration(MesosConfiguration mesosConfiguration) {
     this.mesosConfiguration = mesosConfiguration;
   }
 
+  public void setNetworkConfiguration(NetworkConfiguration networkConfiguration) {
+    this.networkConfiguration = networkConfiguration;
+  }
+
   public void setNewTaskCheckerBaseDelaySeconds(int newTaskCheckerBaseDelaySeconds) {
     this.newTaskCheckerBaseDelaySeconds = newTaskCheckerBaseDelaySeconds;
   }

SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java

@@ -44,6 +44,7 @@
 import com.hubspot.mesos.Resources;
 import com.hubspot.mesos.SingularityContainerInfo;
 import com.hubspot.mesos.SingularityDockerInfo;
+import com.hubspot.mesos.SingularityDockerNetworkType;
 import com.hubspot.mesos.SingularityDockerPortMapping;
 import com.hubspot.mesos.SingularityVolume;
 import com.hubspot.singularity.SingularityTask;
@@ -231,14 +232,25 @@ private void prepareContainerInfo(final Offer offer, final SingularityTaskId tas
         dockerInfoBuilder.setNetwork(DockerInfo.Network.valueOf(dockerInfo.get().getNetwork().get().toString()));
       }
 
-      if ((dockerInfo.get().hasAllLiteralHostPortMappings() || ports.isPresent()) && !dockerInfo.get().getPortMappings().isEmpty()) {
-        for (SingularityDockerPortMapping singularityDockerPortMapping : dockerInfo.get().getPortMappings()) {
+      final List<SingularityDockerPortMapping> portMappings = dockerInfo.get().getPortMappings();
+      final boolean isBridged = SingularityDockerNetworkType.BRIDGE.equals(dockerInfo.get().getNetwork().orNull());
+
+      if ((dockerInfo.get().hasAllLiteralHostPortMappings() || ports.isPresent()) && !portMappings.isEmpty()) {
+        for (SingularityDockerPortMapping singularityDockerPortMapping : portMappings) {
           final Optional<DockerInfo.PortMapping> maybePortMapping = buildPortMapping(singularityDockerPortMapping, ports);
 
           if (maybePortMapping.isPresent()) {
             dockerInfoBuilder.addPortMappings(maybePortMapping.get());
           }
         }
+      } else if (configuration.getNetworkConfiguration().isDefaultPortMapping() && isBridged && portMappings.isEmpty() && ports.isPresent()) {
+        for (long longPort : ports.get()) {
+          int port = Ints.checkedCast(longPort);
+          dockerInfoBuilder.addPortMappings(DockerInfo.PortMapping.newBuilder()
+              .setHostPort(port)
+              .setContainerPort(port)
+              .build());
+        }
       }
 
       if (!dockerInfo.get().getParameters().isEmpty()) {

SingularityService/src/test/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilderTest.java

@@ -13,6 +13,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.mesos.Protos;
+import org.apache.mesos.Protos.ContainerInfo.DockerInfo.PortMapping;
 import org.apache.mesos.Protos.ContainerInfo.Type;
 import org.apache.mesos.Protos.FrameworkID;
 import org.apache.mesos.Protos.Offer;
@@ -48,10 +49,12 @@
 import com.hubspot.singularity.SingularityRequestBuilder;
 import com.hubspot.singularity.SingularityTask;
 import com.hubspot.singularity.SingularityTaskRequest;
+import com.hubspot.singularity.config.NetworkConfiguration;
 import com.hubspot.singularity.config.SingularityConfiguration;
 import com.hubspot.singularity.data.ExecutorIdGenerator;
 
 public class SingularityMesosTaskBuilderTest {
+  private final SingularityConfiguration configuration = new SingularityConfiguration();
   private SingularityMesosTaskBuilder builder;
   private Resources taskResources;
   private Resources executorResources;
@@ -68,7 +71,7 @@ public void createMocks() {
 
     when(idGenerator.getNextExecutorId()).then(new CreateFakeId());
 
-    builder = new SingularityMesosTaskBuilder(new ObjectMapper(), slaveAndRackHelper, idGenerator, new SingularityConfiguration());
+    builder = new SingularityMesosTaskBuilder(new ObjectMapper(), slaveAndRackHelper, idGenerator, configuration);
 
     taskResources = new Resources(1, 1, 0);
     executorResources = new Resources(0.1, 1, 0);
@@ -186,7 +189,9 @@ public void testDockerMinimalNetworking() {
         SingularityContainerType.DOCKER,
         Optional.<List<SingularityVolume>>absent(),
         Optional.of(new SingularityDockerInfo("docker-image", true, SingularityDockerNetworkType.NONE,
-            Optional.<List<SingularityDockerPortMapping>>absent())));
+            Optional.<List<SingularityDockerPortMapping>>absent(),
+            Optional.<Boolean>absent(),
+            Optional.<Map<String, String>>absent())));
     final SingularityDeploy deploy = new SingularityDeployBuilder("test", "1")
         .setContainerInfo(Optional.of(containerInfo))
         .build();
@@ -197,6 +202,41 @@ public void testDockerMinimalNetworking() {
     assertEquals(Protos.ContainerInfo.DockerInfo.Network.NONE, task.getMesosTask().getContainer().getDocker().getNetwork());
   }
 
+  @Test
+  public void testAutomaticPortMapping() {
+    NetworkConfiguration netConf = new NetworkConfiguration();
+    netConf.setDefaultPortMapping(true);
+    configuration.setNetworkConfiguration(netConf);
+
+    taskResources = new Resources(1, 1, 2);
+
+    final SingularityRequest request = new SingularityRequestBuilder("test", RequestType.WORKER).build();
+    final SingularityContainerInfo containerInfo = new SingularityContainerInfo(
+        SingularityContainerType.DOCKER,
+        Optional.<List<SingularityVolume>>absent(),
+        Optional.of(new SingularityDockerInfo("docker-image", false, SingularityDockerNetworkType.BRIDGE,
+            Optional.<List<SingularityDockerPortMapping>>absent(),
+            Optional.<Boolean>absent(),
+            Optional.<Map<String, String>>absent())));
+    final SingularityDeploy deploy = new SingularityDeployBuilder("test", "1")
+        .setContainerInfo(Optional.of(containerInfo))
+        .build();
+    final SingularityTaskRequest taskRequest = new SingularityTaskRequest(request, deploy, pendingTask);
+    final SingularityTask task = builder.buildTask(offer, Collections.singletonList(MesosUtils.getPortRangeResource(31010, 31011)), taskRequest, taskResources, executorResources);
+
+    assertEquals(Type.DOCKER, task.getMesosTask().getContainer().getType());
+    assertEquals(Protos.ContainerInfo.DockerInfo.Network.BRIDGE, task.getMesosTask().getContainer().getDocker().getNetwork());
+
+    List<PortMapping> portMappings = task.getMesosTask().getContainer().getDocker().getPortMappingsList();
+    assertEquals(2, portMappings.size());
+
+    assertEquals(31010, portMappings.get(0).getHostPort());
+    assertEquals(31010, portMappings.get(0).getContainerPort());
+
+    assertEquals(31011, portMappings.get(1).getHostPort());
+    assertEquals(31011, portMappings.get(1).getContainerPort());
+  }
+
   private static class CreateFakeId implements Answer<String> {
 
     private final AtomicLong string = new AtomicLong();