X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsetup.sh;fp=scripts%2Fsetup.sh;h=5b246c505d97b35b52760730a87f180b14fb3ba2;hb=22a21af7a3f5a0d52b0ddb118d79f69a22c1c60f;hp=069262258e53971e64b444bcd57b55ab7df54a77;hpb=ffa5b6d0720bd369eb4aaad581c26fabae025102;p=eliot.git

diff --git a/scripts/setup.sh b/scripts/setup.sh
index 0692622..5b246c5 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -60,8 +60,8 @@ setup_k8sworkers()
   #SETUP_WORKER_COMMON="cd eliot/scripts/ && source common.sh"
   SETUP_WORKER="cd eliot/scripts/ && source k8sworker.sh"
 
-  KUBEADM_JOIN=$(grep "kubeadm join" ./kubeadm.log)
-  KUBEADM_JOIN="sudo ${KUBEADM_JOIN}"
+  KUBEADM_TOKEN=$(kubeadm token create --print-join-command)
+  KUBEADM_JOIN="sudo ${KUBEADM_TOKEN}"
 
  # Read all the Worker Node details from nodelist file.
  while read line
@@ -141,6 +141,12 @@ verify_k8s_status(){
   source verifyk8s.sh | tee verifyk8s.log
 }
 
+
+install_edgex(){
+ set -o xtrace
+ cd edgex && source edgexonk8s.sh
+}
+
 install_cadvisor_edge(){
  set -o xtrace
  SETUP_CADVISOR_ATEDGE="cd eliot/scripts/ && source cadvisorsetup.sh"
@@ -181,3 +187,12 @@ sleep 10
 install_prometheus
 sleep 5
 sudo docker ps | grep prometheus
+
+install_edgex
+sleep 20
+
+# Removing the taint from master node
+kubectl taint nodes --all node-role.kubernetes.io/master- || true
+
+echo "ELIOT Setup execution is Completed..."
+