From 3a1eef449b024747dc271b361d8af5a31d89ff3b Mon Sep 17 00:00:00 2001
From: volodymyr-babak <volodymyr.babak@gmail.com>
Date: Wed, 10 May 2017 21:34:49 +0300
Subject: [PATCH] TB-58: k8s feature improvements

---
 docker/thingsboard/run_thingsboard.sh |  3 ---
 docker/thingsboard/thingsboard.yaml   | 37 ++++++++-------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/docker/thingsboard/run_thingsboard.sh b/docker/thingsboard/run_thingsboard.sh
index 404cc8df9d..877fed7fec 100755
--- a/docker/thingsboard/run_thingsboard.sh
+++ b/docker/thingsboard/run_thingsboard.sh
@@ -34,9 +34,6 @@ done
 # Copying env variables into conf files
 printenv | awk -F "=" '{print "export " $1 "='\''" $2 "'\''"}' >> /usr/share/thingsboard/conf/thingsboard.conf
 
-# Set env variable for RPC address
-echo "export RPC_HOST='"$(hostname -f)"'" | tee -a /usr/share/thingsboard/conf/thingsboard.conf
-
 cat /usr/share/thingsboard/conf/thingsboard.conf
 
 echo "Starting 'Thingsboard' service..."
diff --git a/docker/thingsboard/thingsboard.yaml b/docker/thingsboard/thingsboard.yaml
index a9c1df37d8..02326c1671 100644
--- a/docker/thingsboard/thingsboard.yaml
+++ b/docker/thingsboard/thingsboard.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: tb-external-ip
+  name: tb-service
   labels:
-    app: tb-external-ip
+    app: tb-service
 spec:
   ports:
   - port: 8080
@@ -17,20 +17,6 @@ spec:
     app: tb
   type: LoadBalancer
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  name: tb-headless
-  labels:
-    app: tb-headless
-spec:
-  ports:
-  - port: 9001
-    name: rpc
-  selector:
-    app: tb
-  clusterIP: None
----
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
@@ -55,14 +41,13 @@ kind: StatefulSet
 metadata:
   name: tb
 spec:
-  serviceName: "tb-headless"
+  serviceName: "tb-service"
   replicas: 2
   template:
     metadata:
       labels:
         app: tb
     spec:
-      terminationGracePeriodSeconds: 10
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -71,7 +56,7 @@ spec:
                   - key: "app"
                     operator: In
                     values:
-                    - tb-headless
+                    - tb-service
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: tb
@@ -109,19 +94,17 @@ spec:
             configMapKeyRef:
               name: tb-config
               key: cassandra.url
+        - name : RPC_HOST
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
         command:
         - sh
         - -c
         - ./run_thingsboard.sh
-#        readinessProbe:
-#          httpGet:
-#            path: /login
-#            port: ui-port
-#          initialDelaySeconds: 30
-#          periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /login
             port: ui-port
-          initialDelaySeconds: 30
-          periodSeconds: 10
\ No newline at end of file
+          initialDelaySeconds: 120
+          timeoutSeconds: 10
\ No newline at end of file