Merge pull request #491 from ContainerSolutions/feature/mesos-1.0.0-d…

…efault--version Upgraded to Mesos 1.0.0
ContainerSolutions · Aug 4, 2016 · 69f0c04 · 69f0c04
2 parents 3273ade + e750de8
commit 69f0c04
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 61 deletions.
diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@ setup:
 	sudo route delete 172.17.0.0/16; sudo route -n add 172.17.0.0/16 $(shell docker-machine ip ${shell DOCKER_MACHINE_NAME})
 
 deps:
-	docker pull containersol/mesos-agent:0.25.0-0.1.0
-	docker pull containersol/mesos-master:0.25.0-0.1.0
+	docker pull containersol/mesos-agent:1.0.0-0.1.0
+	docker pull containersol/mesos-master:1.0.0-0.1.0
 	docker pull gliderlabs/registrator:v6
 	docker pull containersol/consul-server:0.6-1
 	docker pull mesosphere/marathon:v0.15.3

diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,7 @@ subprojects {
 }
 
 ext {
-    mesosVer = "0.25.0"
+    mesosVer = "1.0.0"
     imagePrefix = 'containersol'
 }
 

diff --git a/cli/src/test/resources/clusterconfig/basic.groovy b/cli/src/test/resources/clusterconfig/basic.groovy
@@ -4,7 +4,7 @@ minimesos {
 
     mapPortsToHost = true
     timeout = 60
-    mesosVersion = "0.25.0"
+    mesosVersion = "1.0.0"
     clusterName = "minimesos-test"
 
     master {
@@ -28,7 +28,7 @@ minimesos {
         }
 
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
 
     }
 

diff --git a/cli/src/test/resources/configFiles/complete-minimesosFile b/cli/src/test/resources/configFiles/complete-minimesosFile
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -50,7 +50,7 @@ minimesos {
         aclJson = null
         authenticate = false
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
     }
 

diff --git a/cli/src/test/resources/configFiles/marathonAppConfig-minimesosFile b/cli/src/test/resources/configFiles/marathonAppConfig-minimesosFile
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         portNumber = 5051
 
         resources {
@@ -52,7 +52,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
     }
 
     registrator {

diff --git a/docs/index.md b/docs/index.md
@@ -219,7 +219,7 @@ Initialized minimesosFile in this directory
 
 $ minimesos up
 Minimesos cluster is running: 3878417609
-Mesos version: 0.25.0
+Mesos version: 1.0.0
 export MINIMESOS_NETWORK_GATEWAY=172.17.0.1
 export MINIMESOS_AGENT=http://172.17.0.5:5051; export MINIMESOS_AGENT_IP=172.17.0.5
 export MINIMESOS_ZOOKEEPER=zk://172.17.0.3:2181/mesos; export MINIMESOS_ZOOKEEPER_IP=172.17.0.3
@@ -228,7 +228,7 @@ export MINIMESOS_CONSUL=http://172.17.0.7:8500; export MINIMESOS_CONSUL_IP=172.1
 export MINIMESOS_MASTER=http://172.17.0.4:5050; export MINIMESOS_MASTER_IP=172.17.0.4
 
 $ minimesos state | jq ".version"
-0.25.0
+1.0.0
 
 $ minimesos destroy
 Destroyed minimesos cluster 3878417609

diff --git a/minimesos/src/main/groovy/com/containersol/minimesos/config/ClusterConfig.groovy b/minimesos/src/main/groovy/com/containersol/minimesos/config/ClusterConfig.groovy
@@ -7,7 +7,7 @@ import org.apache.commons.lang.StringUtils
 class ClusterConfig extends GroovyBlock {
 
     public static final int DEFAULT_TIMEOUT_SECS = 60
-    public static final String DEFAULT_MESOS_VERSION = "0.25.0"
+    public static final String DEFAULT_MESOS_VERSION = "1.0.0"
     public static final String DEFAULT_MINIMESOS_DOCKER_VERSION = "0.1.0"
     public static final String DEFAULT_MESOS_CONTAINER_TAG = DEFAULT_MESOS_VERSION + "-" + DEFAULT_MINIMESOS_DOCKER_VERSION
     public static final String DEFAULT_CONFIG_FILE = "minimesosFile"

diff --git a/.../src/test/java/com/containersol/minimesos/RestoreConfigurationFromRunningClusterTest.java b/.../src/test/java/com/containersol/minimesos/RestoreConfigurationFromRunningClusterTest.java
@@ -29,7 +29,7 @@ public void testMesosVersionRestored() {
         String clusterId = CLUSTER.getClusterId();
         MesosCluster cluster = MesosCluster.loadCluster(clusterId, new MesosClusterContainersFactory());
 
-        assertEquals("0.25.0", cluster.getMesosVersion());
+        assertEquals("1.0.0", cluster.getMesosVersion());
     }
 
 }
diff --git a/minimesos/src/test/java/com/containersol/minimesos/RunTaskTest.java b/minimesos/src/test/java/com/containersol/minimesos/RunTaskTest.java
@@ -5,14 +5,12 @@
 import com.containersol.minimesos.config.ClusterConfig;
 import com.containersol.minimesos.config.ContainerConfigBlock;
 import com.containersol.minimesos.config.MesosAgentConfig;
-import com.containersol.minimesos.config.MesosContainerConfig;
 import com.containersol.minimesos.container.AbstractContainer;
 import com.containersol.minimesos.docker.DockerClientFactory;
 import com.containersol.minimesos.junit.MesosClusterTestRule;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
-import com.jayway.awaitility.Awaitility;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -28,8 +26,8 @@ public class RunTaskTest {
 
     public static final MesosCluster CLUSTER = RULE.getMesosCluster();
 
-    public static class LogContainerTestCallback extends LogContainerResultCallback {
-        protected final StringBuffer log = new StringBuffer();
+    private static class LogContainerTestCallback extends LogContainerResultCallback {
+        final StringBuffer log = new StringBuffer();
 
         @Override
         public void onNext(Frame frame) {
@@ -66,17 +64,14 @@ protected CreateContainerCmd dockerCommand() {
             }
         };
 
-        CLUSTER.addAndStartProcess(mesosAgent);
-        LogContainerTestCallback cb = new LogContainerTestCallback();
-        DockerClientFactory.build().logContainerCmd(mesosAgent.getContainerId()).withStdOut(true).exec(cb);
-        cb.awaitCompletion();
+        String containerId = CLUSTER.addAndStartProcess(mesosAgent);
 
         await("Mesos Execute container did not start responding").atMost(60, TimeUnit.SECONDS).until(() -> {
             LogContainerTestCallback cb1 = new LogContainerTestCallback();
-            DockerClientFactory.build().logContainerCmd(mesosAgent.getContainerId()).withStdOut(true).exec(cb1);
+            DockerClientFactory.build().logContainerCmd(mesosAgent.getContainerId()).withContainerId(containerId).withStdOut(true).exec(cb1);
             cb1.awaitCompletion();
             String log = cb1.toString();
-            return log.contains("Received status update TASK_FINISHED for task test-cmd");
+            return log.contains("Received status update TASK_FINISHED for task 'test-cmd'");
         });
     }
 

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-authenticationTest b/minimesos/src/test/resources/configFiles/minimesosFile-authenticationTest
@@ -8,7 +8,7 @@ minimesos {
 
     master {
         imageName       = "containersol/mesos-master"
-        imageTag        = "0.25.0-0.1.0"
+        imageTag        = "1.0.0-0.1.0"
         authenticate    = true
         aclJson         = """
                             {
@@ -28,7 +28,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-consulRegistrationTest b/minimesos/src/test/resources/configFiles/minimesosFile-consulRegistrationTest
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -48,7 +48,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
     }
 

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-defaultMinimumClusterTest b/minimesos/src/test/resources/configFiles/minimesosFile-defaultMinimumClusterTest
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -43,7 +43,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
     }
 

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-dynamicClusterTest b/minimesos/src/test/resources/configFiles/minimesosFile-dynamicClusterTest
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         portNumber = 5051
 
         resources {
@@ -37,7 +37,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
     }
 
     zookeeper {

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-mesosClusterTest b/minimesos/src/test/resources/configFiles/minimesosFile-mesosClusterTest
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -38,7 +38,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -68,7 +68,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -103,7 +103,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
     }
 

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-restoreConfigTest b/minimesos/src/test/resources/configFiles/minimesosFile-restoreConfigTest
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
         portNumber = 5051
 
@@ -43,7 +43,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         loggingLevel = "# INHERIT FROM CLUSTER"
     }
 

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-runTaskTest b/minimesos/src/test/resources/configFiles/minimesosFile-runTaskTest
@@ -8,7 +8,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         portNumber = 5051
 
         resources {
@@ -37,7 +37,7 @@ minimesos {
 
     agent {
         imageName = "containersol/mesos-agent"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
         portNumber = 5051
 
         resources {
@@ -66,7 +66,7 @@ minimesos {
 
     master {
         imageName = "containersol/mesos-master"
-        imageTag = "0.25.0-0.1.0"
+        imageTag = "1.0.0-0.1.0"
     }
 
     zookeeper {

diff --git a/...docker/scheduler/src/main/java/com/containersolutions/mesoshelloworld/scheduler/Main.java b/...docker/scheduler/src/main/java/com/containersolutions/mesoshelloworld/scheduler/Main.java
@@ -1,11 +1,8 @@
 package com.containersolutions.mesoshelloworld.scheduler;
 
-import com.google.protobuf.ByteString;
 import org.apache.mesos.MesosSchedulerDriver;
 import org.apache.mesos.Protos;
 
-/**
- */
 public class Main {
     public static void main(String[] args) throws Exception {
 
@@ -33,8 +30,8 @@ public static void main(String[] args) throws Exception {
                         frameworkInfo,
                         mesosMaster,
                         Protos.Credential.newBuilder()
-                                .setPrincipal( principal )
-                                .setSecret(ByteString.copyFromUtf8(configuration.getFrameworkSecret()))
+                                .setPrincipal(principal)
+                                .setSecret(configuration.getFrameworkSecret())
                                 .build()
                 )
               : new MesosSchedulerDriver(

diff --git a/...duler/src/main/java/com/containersolutions/mesoshelloworld/scheduler/TaskInfoFactory.java b/...duler/src/main/java/com/containersolutions/mesoshelloworld/scheduler/TaskInfoFactory.java
@@ -4,12 +4,11 @@
 
 import java.util.UUID;
 
-
-public class TaskInfoFactory {
+class TaskInfoFactory {
 
     private final Configuration configuration;
 
-    public TaskInfoFactory(Configuration configuration) {
+    TaskInfoFactory(Configuration configuration) {
         this.configuration = configuration;
     }
 
@@ -62,7 +61,6 @@ private DiscoveryInfo.Builder newDiscoveryInfo(Integer port) {
     }
 
     private ExecutorInfo.Builder newExecutorInfo(Configuration configuration) {
-
         ContainerInfo.DockerInfo.Builder dockerBuilder = ContainerInfo.DockerInfo.newBuilder()
                 .setNetwork(ContainerInfo.DockerInfo.Network.BRIDGE)
                 .setImage(configuration.getExecutorImage())
@@ -71,18 +69,8 @@ private ExecutorInfo.Builder newExecutorInfo(Configuration configuration) {
         return ExecutorInfo.newBuilder()
                 .setExecutorId(ExecutorID.newBuilder().setValue(UUID.randomUUID().toString()))
                 .setName("hello-world-executor-" + UUID.randomUUID().toString())
-                .setCommand(newCommandInfo(configuration))
-                .setContainer(ContainerInfo.newBuilder()
-                        .setType(ContainerInfo.Type.DOCKER)
-                        .setDocker( dockerBuilder )
-                        .build());
+                .setCommand(CommandInfo.newBuilder().setShell(false))
+                .setContainer(ContainerInfo.newBuilder().setType(ContainerInfo.Type.DOCKER).setDocker(dockerBuilder));
     }
 
-    private CommandInfo.Builder newCommandInfo(Configuration configuration) {
-        return CommandInfo.newBuilder()
-                .setShell(false)
-                .setContainer(CommandInfo.ContainerInfo.newBuilder().setImage(configuration.getExecutorImage()).build());
-    }
-
-
 }