Kubeedge cleanup and code optimisation

[eliot.git] / scripts / src / kubeedge_setup.sh

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index 8e7ca82..e75c1be 100755 (executable)
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -17,6 +17,7 @@ take_keedge(){
 }
 
 source config_kubeedge
+
 common_steps="echo $GOPATH && \
 echo $HOME && \
 echo $(whoami) && \
@@ -27,12 +28,9 @@ sudo chmod -R 777 github.com && \
 cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
 make"
 
-certif_copy="cd /etc/kubeedge &&\
-scp certs.tar.gz"
-
 edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
 sudo chmod +x kubeedge && \
-sudo ./kubeedge join --edgecontrollerip=$masternodeip --edgenodeid=edgenode001 --k8sserverip=$masternodeip:8080"
+sudo ./kubeedge join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID --k8sserverip=$MASTERNODEIP:8080"
 
 execute_keedge_controller(){
    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
@@ -41,42 +39,30 @@ execute_keedge_controller(){
 }
 
 exec_edge(){
-echo $(whoami)
-echo =========
-echo $(pwd)
-echo ========
-echo $GOPATH
-echo ========
-echo $HOME
-
-user_check="jenkins"
-home_path="/home/jenkins"
-   #if [ $HOME == $home_path ];then
-   cd /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src
-   #else
-   #   cd $HOME/eliot/scripts/src
-   #fi
-
-   #if [ $HOME == $home_path ];then
-   sshpass -p ${edgenodepassword} scp /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
-   #else
-   #   sshpass -p ${edgenodepassword} scp $HOME/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
-   #fi
-
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} \
+
+   cd $PATH_OF_ELIOTFOLDER/scripts/src
+
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
    source config_kubeedge
 
    source config_kubeedge
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${common_steps} < /dev/null
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps} < /dev/null
 
    echo "After cloning the code in ELIOT edge node"
-   sshpass -p ${edgenodepassword} scp /etc/kubeedge/certs.tgz ${edgenodeusr}@${edgenodeip}:/etc/kubeedge
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp /etc/kubeedge/certs.tgz ${EDGENODEUSR}@${EDGENODEIP}:/etc/kubeedge
 
-   sshpass -p ${edgenodepassword} \
-   ssh ${edgenodeusr}@${edgenodeip} \
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} \
    tar -xvzf /etc/kubeedge/certs.tgz --directory /etc/kubeedge
 
-   sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${edge_start} < /dev/null
+   sshpass -p ${EDGENODEPASSWORD} \
+   ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start} < /dev/null
 }
 
 # start
@@ -92,16 +78,6 @@ exec_edge
 sleep 10
 sudo kubectl get nodes
 
-#user_chec="jenkins"
-
-#if [ $(whoami) == $user_chec ];then
-
-chmod +x /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
-source /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
-
-#else
-
-#  chmod +x $HOME/eliot/scripts/verifyk8s.sh
-#  source $HOME/eliot/scripts/verifyk8s.sh
+chmod +x $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
+source $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
 
-#fi