Merge "Optimization for duplicate code removal"

diff --git a/scripts/k8smaster.sh b/scripts/k8smaster.sh
index e13e662..8fd511d 100644 (file)
--- a/scripts/k8smaster.sh
+++ b/scripts/k8smaster.sh
@@ -12,6 +12,9 @@ KUBE_VERSION=1.13.0-00
 POD_NETWORK_CIDR=192.168.0.0/16
 K8S_CNI_VERSION=0.6.0-00
 
+#K8s service CIDR range
+K8s_SVC_CIDR=10.96.0.0/12
+
 # Install Kubernetes with Kubeadm
 
 # Disable swap
@@ -38,7 +41,8 @@ if ! kubectl get nodes; then
   sudo kubeadm config images pull
   sudo kubeadm init \
         --apiserver-advertise-address="${MASTER_IP}" \
-        --pod-network-cidr="${POD_NETWORK_CIDR}"
+        --pod-network-cidr="${POD_NETWORK_CIDR}" \
+         --service-cidr="${K8s_SVC_CIDR}"
 
   if [ "$(id -u)" = 0 ]; then
     echo "export KUBECONFIG=/etc/kubernetes/admin.conf" | \

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index 56c6db5..4d6b606 100755 (executable)
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -8,6 +8,10 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+#Constants
+KUBEEDGE_SRC="$GOPATH/src/github.com/kubeedge/kubeedge"
+KUBEEDGE_BIN="$GOPATH/src/github.com/kubeedge/kubeedge/keadm"
+
 { set +x; } > /dev/null 2>&1
 
 if [ -n "$1" ]; then
@@ -35,24 +39,22 @@ take_keedge(){
 
     source ~/.profile
     git clone https://github.com/kubeedge/kubeedge.git \
-$GOPATH/src/github.com/kubeedge/kubeedge
-    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+    $KUBEEDGE_SRC
+    cd $KUBEEDGE_BIN
     make
 }
 
 source config_kubeedge > /dev/null 2>&1
 
 common_steps="echo $GOPATH && \
-echo $HOME && \
-echo $(whoami) && \
-git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
+git clone https://github.com/kubeedge/kubeedge.git $KUBEEDGE_SRC && \
 source ~/.profile && \
 cd $GOPATH/src && \
 sudo chmod -R 777 github.com && \
-cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
+cd $KUBEEDGE_BIN && \
 make"
 
-edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
+edge_start="cd $KUBEEDGE_BIN && \
 sudo chmod +x keadm && \
 sudo ./keadm join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID \
 --k8sserverip=$MASTERNODEIP:8080"
@@ -60,7 +62,7 @@ sudo ./keadm join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID \
 # Initialisation of ELIOT master with kubeedge
 
 execute_keedge_controller(){
-    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+    cd $KUBEEDGE_BIN
     sudo chmod +x keadm
     sudo ./keadm init
 }