fix: handle IP address change (#116)

Co-authored-by: Krishnamurthy Jambur <[email protected]>

Author: hyunsun

standalone-node/cluster_installers/sen-k3s-installer.sh

@@ -13,14 +13,10 @@ echo "$(date): Configuring k3s 1/12" | sudo tee /var/log/cluster-init.log | sudo
 sudo mkdir -p /etc/rancher/k3s
 sudo bash -c 'cat << EOF >  /etc/rancher/k3s/config.yaml
 write-kubeconfig-mode: "0644"
-cluster-init: true
 cluster-cidr: "10.42.0.0/16"
 cluster-dns: "10.43.0.10"
 data-dir : /var/lib/rancher/k3s
 disable-kube-proxy: false
-etcd-arg:
-  - --cipher-suites=[TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256,TLS_CHACHA20_POLY1305_SHA256]
-etcd-expose-metrics: false
 kube-apiserver-arg:
   - "feature-gates=PortForwardWebsockets=true"
   - "tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
@@ -42,11 +38,11 @@ sudo mkdir -p $K3S_BIN_PATH
 
 # Set up mirrors
 sudo bash -c 'cat << EOF >  /etc/rancher/k3s/registries.yaml
-mirrors: 
- docker.io: 
+mirrors:
+ docker.io:
    endpoint: ["https://localhost.internal:9443"]
-   
- rs-proxy.rs-proxy.svc.cluster.local:8443: 
+
+ rs-proxy.rs-proxy.svc.cluster.local:8443:
    endpoint: ["https://localhost.internal:9443"]
 EOF'
 
@@ -140,7 +136,7 @@ IP address of the Node:
 	$IP - Ensure IP address is persistent across the reboot!
         See: https://ranchermanager.docs.rancher.com/getting-started
 	/installation-and-upgrade/installation-requirements#node-ip-
-	addresses 
+	addresses
 
 To access and view the cluster's pods run:
   source /home/<default-user>/.bashrc

standalone-node/provisioning_scripts/k3s-setup-post-reboot.sh

@@ -20,50 +20,54 @@ do
     fi
 done
 if [[ "$host_ip" != "$host_prev_ip" ]]; then
-   echo "IP changed"
-   CHANGE_MSG="Warning: The Edge Node IP($host_ip) has changed since k3s install!"
+   echo "The Edge Node IP($host_ip) has changed since k3s install"
    banner="
 ================================================================================
-Edge Microvisor Toolkit - cluster bring up problem
-
-****Looks the IP address of the system chnaged since k3s install*****
-
 OLD k3s cluster IP $host_prev_ip
 NEW k3s cluster IP $host_ip
-
-IP address of the Node:
-        $host_prev_ip - Ensure IP address is persistent across the reboot!
-        See: https://ranchermanager.docs.rancher.com/getting-started
-        /installation-and-upgrade/installation-requirements#node-ip-
-        addresses $CHANGE_MSG
-
 =================================================================================
 "
    # Print the banner
    sleep 10
    echo "$banner" | sudo tee /dev/tty0
-else
-   CHANGE_MSG="IP address remained same after reboot." 
+
    while [ true ]
    do
       k3s_status=$(systemctl is-active k3s)
       if [[ "$k3s_status" == "active" ]]; then
-	  
-          echo "Waiting for all extensions to complete the deployment..." | sudo tee /dev/tty0
-          while sudo -E KUBECONFIG=/etc/rancher/k3s/k3s.yaml /usr/bin/k3s kubectl get pods --all-namespaces --field-selector=status.phase!=Running,status.phase!=Succeeded --no-headers | grep -q .; do
-          echo "Some pods are still not ready. Checking again in 5 seconds..." | sudo tee /dev/tty0
-          sleep 5
-          done
+          echo "Reconfiguring cluster..." | sudo tee /dev/tty0
+          k3s kubectl delete node edgemicrovisortoolkit
+          sudo systemctl restart k3s
+          echo "Restarted k3s" | sudo tee /dev/tty0
 	  break
       else
-	  echo "Waiting for k3s services to running state,please wait checking again in few seconds" | sudo tee /dev/tty0
-	  sleep 30
+          echo "K3s service is still not active. Checking in 10 seconds..." | sudo tee /dev/tty0
+          sleep 10
       fi
    done
+   echo $host_ip > $IPCHECK
+fi
 
-   # Print banner
+while [ true ]
+do
+   k3s_status=$(systemctl is-active k3s)
+   if [[ "$k3s_status" == "active" ]]; then
+
+       echo "Waiting for all extensions to complete the deployment..." | sudo tee /dev/tty0
+       while sudo -E KUBECONFIG=/etc/rancher/k3s/k3s.yaml /usr/bin/k3s kubectl get pods --all-namespaces --field-selector=status.phase!=Running,status.phase!=Succeeded --no-headers | grep -q .; do
+       echo "Some pods are still not ready. Checking again in 5 seconds..." | sudo tee /dev/tty0
+       sleep 5
+       done
+       break
+   else
+       echo "Waiting for k3s services to running state,please wait checking again in few seconds" | sudo tee /dev/tty0
+       sleep 30
+   fi
+done
 
-    banner="
+# Print banner
+
+banner="
 ===================================================================
 Edge Microvisor Toolkit - cluster bringup complete
 Logs located at:
@@ -72,12 +76,6 @@ Logs located at:
 For k3s logs run:
         sudo journalctl -fu k3s
 
-IP address of the Node:
-        $IP - Ensure IP address is persistent across the reboot!
-        See: https://ranchermanager.docs.rancher.com/getting-started
-        /installation-and-upgrade/installation-requirements#node-ip-
-        addresses $CHANGE_MSG
-
 To access and view the cluster's pods run:
         source /etc/environment
         export KUBECONFIG
@@ -87,6 +85,5 @@ KUBECONFIG available at:
         /etc/rancher/k3s/k3s.yaml
 ===================================================================
 "
-    # Print the banner
-    echo "$banner" | sudo tee /dev/tty0
-fi
+# Print the banner
+echo "$banner" | sudo tee /dev/tty0