From 2b18ed7a9294d72ecfcf24534dc2b70cb8592fbf Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Fri, 19 May 2017 11:46:15 +0300
Subject: [PATCH] Misc improvements

---
 docker/cassandra/cassandra.yaml     | 10 ++++++----
 docker/thingsboard/thingsboard.yaml |  6 ++++--
 docker/zookeeper/zookeeper.yaml     |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker/cassandra/cassandra.yaml b/docker/cassandra/cassandra.yaml
index 6da5532c3f..24312ae562 100644
--- a/docker/cassandra/cassandra.yaml
+++ b/docker/cassandra/cassandra.yaml
@@ -34,12 +34,14 @@ metadata:
   name: cassandra
 spec:
   serviceName: cassandra-headless
-  replicas: 3
+  replicas: 2
   template:
     metadata:
       labels:
         app: cassandra
     spec:
+      nodeSelector:
+        machinetype: other
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -75,7 +77,7 @@ spec:
               command: ["/bin/sh", "-c", "PID=$(pidof java) && kill $PID && while ps -p $PID > /dev/null; do sleep 1; done"]
         env:
           - name: MAX_HEAP_SIZE
-            value: 512M
+            value: 2048M
           - name: HEAP_NEWSIZE
             value: 100M
           - name: CASSANDRA_SEEDS
@@ -118,7 +120,7 @@ spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 2Gi
+          storage: 3Gi
   - metadata:
       name: cassandra-commitlog
       annotations:
@@ -127,4 +129,4 @@ spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: 1Gi
\ No newline at end of file
+          storage: 2Gi
\ No newline at end of file
diff --git a/docker/thingsboard/thingsboard.yaml b/docker/thingsboard/thingsboard.yaml
index 6ef5ab16b4..f03f49bcf1 100644
--- a/docker/thingsboard/thingsboard.yaml
+++ b/docker/thingsboard/thingsboard.yaml
@@ -41,7 +41,7 @@ spec:
   selector:
     matchLabels:
       app: tb
-  minAvailable: 2
+  minAvailable: 3
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -58,12 +58,14 @@ metadata:
   name: tb
 spec:
   serviceName: "tb-service"
-  replicas: 2
+  replicas: 3
   template:
     metadata:
       labels:
         app: tb
     spec:
+      nodeSelector:
+        machinetype: tb
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
diff --git a/docker/zookeeper/zookeeper.yaml b/docker/zookeeper/zookeeper.yaml
index ed7a9f6ba2..062d8cc4ee 100644
--- a/docker/zookeeper/zookeeper.yaml
+++ b/docker/zookeeper/zookeeper.yaml
@@ -35,7 +35,7 @@ kind: ConfigMap
 metadata:
   name: zk-config
 data:
-  ensemble: "zk-0;zk-1;zk-2"
+  ensemble: "zk-0;zk-1"
   replicas: "3"
   jvm.heap: "500m"
   tick: "2000"
@@ -64,7 +64,7 @@ metadata:
   name: zk
 spec:
   serviceName: zk-headless
-  replicas: 3
+  replicas: 2
   template:
     metadata:
       labels:
@@ -72,6 +72,8 @@ spec:
       annotations:
         pod.alpha.kubernetes.io/initialized: "true"
     spec:
+      nodeSelector:
+        machinetype: other
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution: