Merge pull request #120 from observIQ/feat/mesos-separate-containers

Added separate containers for Mesos master and agent

Author: algchoo

charts/apache-mesos/templates/configmap.yaml

@@ -1,15 +1,22 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: start-script
+  name: master-start-script
 data:
   startup.sh: |
     #!/bin/bash
 
-    # Run mesos master, agent, and exporter in the background
+    # Run mesos master and exporter in the background
     mesos-master --work_dir=/var/lib/mesos --log_dir=/var/log/mesos/ &
-    mesos-agent --work_dir=/var/lib/mesos/agent --log_dir=/var/log/mesos --master=localhost:5050 --launcher=posix --systemd_enable_support=false &
-    /mesos_exporter-1.1.2.linux-arm64/mesos_exporter -master http://localhost:5050 &
+    /mesos_exporter-1.1.2.linux-arm64/mesos_exporter -master http://localhost:5050
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: agent-start-script
+data:
+  startup.sh: |
+    #!/bin/bash
 
-    # Infinite loop to keep container alive
-     while :; do echo 'Hit CTRL+C'; sleep 1; done
+    # Run mesos agent and exporter in the background
+    mesos-agent --work_dir=/var/lib/mesos/agent --log_dir=/var/log/mesos --master=localhost:5050 --launcher=posix --systemd_enable_support=false

charts/apache-mesos/templates/deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       hostNetwork: true
       containers:
-      - name: mesos
+      - name: mesos-master
         image: {{ .Values.image }}
         env:
         - name: LD_LIBRARY_PATH
@@ -23,11 +23,28 @@ spec:
         volumeMounts:
         - mountPath: /startup.sh
           subPath: startup.sh
-          name: start-script
+          name: master-start-script
+      - name: mesos-agent
+        image: {{ .Values.image }}
+        env:
+        - name: LD_LIBRARY_PATH
+          value: "/usr/local/lib"
+        command: ["/bin/bash", "/startup.sh"]
+        volumeMounts:
+        - mountPath: /startup.sh
+          subPath: startup.sh
+          name: agent-start-script
       volumes:
-      - name: start-script
+      - name: master-start-script
+        configMap:
+          name: master-start-script
+          defaultMode: 0777
+          items:
+          - key: startup.sh
+            path: startup.sh
+      - name: agent-start-script
         configMap:
-          name: start-script
+          name: agent-start-script
           defaultMode: 0777
           items:
           - key: startup.sh