Kubeedge code optimized

Signed-off-by: Srinivasan <srinivasan.s.n@huawei.com>
Change-Id: I8211c88648f6d0c80345ddb4dd44a0b19bd8bdf9

diff --git a/scripts/ci_management/cleanup_edge.sh b/scripts/ci_management/cleanup_edge.sh
old mode 100644 (file)
new mode 100755 (executable)
index 37cc2b6..fbafc63
--- a/scripts/ci_management/cleanup_edge.sh
+++ b/scripts/ci_management/cleanup_edge.sh
@@ -21,9 +21,9 @@ source ~/.profile
 
 cd
 
-if [ -d "/root/go/src/github.com/kubeedge/kubeedge/keadm" ]; then
+if [ -d "$GOPATH/src/github.com/kubeedge/kubeedge/keadm" ]; then
    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
-   ./kubeedge reset --k8sserverip $MASTERNODEIP:8080
+   ./keadm reset --k8sserverip $MASTERNODEIP:8080
 fi
 
 cd /etc/kubeedge

diff --git a/scripts/ci_management/cleanup_edge_final.sh b/scripts/ci_management/cleanup_edge_final.sh
index a42e875..716fa61 100644 (file)
--- a/scripts/ci_management/cleanup_edge_final.sh
+++ b/scripts/ci_management/cleanup_edge_final.sh
@@ -15,7 +15,6 @@ KUBEPROXY=$(sudo docker ps | grep k8s.gcr.io | wc -l)
 CONSTZERO="0"
 
 # start
-
 echo "nginx container stop"
 if [ $NGINX != $CONSTZERO ]; then
    sudo docker kill $(docker ps -q --filter ancestor=nginx:1.15.12 )
@@ -23,6 +22,6 @@ fi
 
 echo "kubeproxy container stop"
 if [ $KUBEPROXY != $CONSTZERO ]; then
-   sudo docker kill $(docker ps -q --filter ancestor=k8s.gcr.io/kube-proxy:v1.14.2 )
+   sudo docker kill $(docker ps -q --filter ancestor=k8s.gcr.io/kube-proxy:v1.14.3 )
 fi
 echo "Finished"

diff --git a/scripts/ci_management/cleanup_master.sh b/scripts/ci_management/cleanup_master.sh
index 636535d..0e09973 100755 (executable)
--- a/scripts/ci_management/cleanup_master.sh
+++ b/scripts/ci_management/cleanup_master.sh
@@ -18,9 +18,9 @@ value=$(whoami)
 
 # kubeedge reset internally undo the things done by ./kubeedge init
 
-if [ -d "/root/go/src/github.com/kubeedge/kubeedge/keadm" ]; then
-   cd /root/go/src/github.com/kubeedge/kubeedge/keadm
-   ./kubeedge reset
+if [ -d "$GOPATH/src/github.com/kubeedge/kubeedge/keadm" ]; then
+   cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+   ./keadm reset
 fi
 
 # delete the previously existing certificates
@@ -41,8 +41,8 @@ fi
 
 # delete the kubeedge code
 
-if [ -d "/root/go/src" ]; then
-   cd /root/go
+if [ -d "$GOPATH/src" ]; then
+   cd $GOPATH
    sudo rm -rf src
 fi
 

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index cc9c638..56c6db5 100755 (executable)
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -8,12 +8,36 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+{ set +x; } > /dev/null 2>&1
+
+if [ -n "$1" ]; then
+
+if [ "$1" != "--help" ]; then
+    echo ""
+    echo "Usage of the command is wrong.. Please type ./kubeedge_setup.sh --help for more details"
+    echo ""
+    exit 0
+fi
+
+fi
+
+if [ "$1" == "--help" ]; then
+    echo ""
+    echo "This script will setup the kubeedge installation on Eliot master and Eliot edge"
+    echo "Before Executing this, add Eliot master and Eliot edge details in config_kubeedge file"
+    echo ""
+    exit 0; set -x;
+fi
+
+# take_keedge will download the source code of kubeedge in master and in edge
+
 take_keedge(){
 
-   git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge
-   source ~/.profile
-   cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
-   make
+    source ~/.profile
+    git clone https://github.com/kubeedge/kubeedge.git \
+$GOPATH/src/github.com/kubeedge/kubeedge
+    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+    make
 }
 
 source config_kubeedge > /dev/null 2>&1
@@ -21,7 +45,7 @@ source config_kubeedge > /dev/null 2>&1
 common_steps="echo $GOPATH && \
 echo $HOME && \
 echo $(whoami) && \
-sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
+git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
 source ~/.profile && \
 cd $GOPATH/src && \
 sudo chmod -R 777 github.com && \
@@ -29,40 +53,45 @@ cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
 make"
 
 edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
-sudo chmod +x kubeedge && \
-sudo ./kubeedge join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID --k8sserverip=$MASTERNODEIP:8080"
+sudo chmod +x keadm && \
+sudo ./keadm join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID \
+--k8sserverip=$MASTERNODEIP:8080"
+
+# Initialisation of ELIOT master with kubeedge
 
 execute_keedge_controller(){
-   cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
-   sudo chmod +x kubeedge
-   ./kubeedge init
+    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+    sudo chmod +x keadm
+    sudo ./keadm init
 }
 
+# Initialisation of Eliot edge with kubeedge
+
 exec_edge(){
 
-   cd $PATH_OF_ELIOTFOLDER/scripts/src
+    cd $PATH_OF_ELIOTFOLDER/scripts/src
 
-   sshpass -p ${EDGENODEPASSWORD} \
-   scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
-   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+    sshpass -p ${EDGENODEPASSWORD} \
+    scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
+    ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
 
-   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
-   source config_kubeedge
+    sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
+    source config_kubeedge
 
-   source config_kubeedge > /dev/null 2>&1
-   sshpass -p ${EDGENODEPASSWORD} \
-   ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps}
+    source config_kubeedge > /dev/null 2>&1
+    sshpass -p ${EDGENODEPASSWORD} \
+    ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps}
 
-   echo "After cloning the code in ELIOT edge node"
-   sshpass -p ${EDGENODEPASSWORD} \
-   scp /etc/kubeedge/certs.tgz ${EDGENODEUSR}@${EDGENODEIP}:/etc/kubeedge
+    echo "After cloning the code in ELIOT edge node"
+    sshpass -p ${EDGENODEPASSWORD} \
+    scp /etc/kubeedge/certs.tgz ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
 
-   sshpass -p ${EDGENODEPASSWORD} \
-   ssh ${EDGENODEUSR}@${EDGENODEIP} \
-   tar -xvzf /etc/kubeedge/certs.tgz --directory /etc/kubeedge
+    sshpass -p ${EDGENODEPASSWORD} \
+    ssh ${EDGENODEUSR}@${EDGENODEIP} \
+    sudo tar -xvzf $HOME/certs.tgz --directory /etc/kubeedge
 
-   sshpass -p ${EDGENODEPASSWORD} \
-   ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start}
+    sshpass -p ${EDGENODEPASSWORD} \
+    ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start}
 }
 
 # start
@@ -78,6 +107,16 @@ exec_edge > /dev/null 2>&1
 sleep 10
 sudo kubectl get nodes
 
+if [ "$(id -u)" = 0 ]; then
+    echo "export KUBECONFIG=/etc/kubernetes/admin.conf" | \
+tee -a "${HOME}/.profile"
+    source "${HOME}/.profile"
+else
+    mkdir -p "${HOME}/.kube"
+    sudo cp -i /etc/kubernetes/admin.conf "${HOME}/.kube/config"
+    sudo chown "$(id -u)":"$(id -g)" "${HOME}/.kube/config"
+fi
+
 chmod +x $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
 source $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh