UX imporvements for worker nodes (#3409)

Author: ktsakalozos-canonical

microk8s-resources/wrappers/microk8s-helm.wrapper

@@ -1,3 +1,14 @@
 #!/bin/bash
 
+export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
+source $SNAP/actions/common/utils.sh
+
+if [ -e ${SNAP_DATA}/var/lock/clustered.lock ]
+then
+  echo "This MicroK8s deployment is acting as a node in a cluster. Please use the microk8s helm on the master."
+  exit 0
+fi
+
+exit_if_stopped
+
 "${SNAP}/bin/helm" --kubeconfig="${SNAP_DATA}"/credentials/client.config "$@"

microk8s-resources/wrappers/microk8s-helm3.wrapper

@@ -1,3 +1,14 @@
 #!/bin/bash
 
+export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
+source $SNAP/actions/common/utils.sh
+
+if [ -e ${SNAP_DATA}/var/lock/clustered.lock ]
+then
+  echo "This MicroK8s deployment is acting as a node in a cluster. Please use the microk8s helm on the master."
+  exit 0
+fi
+
+exit_if_stopped
+
 "${SNAP}/bin/helm" --kubeconfig="${SNAP_DATA}"/credentials/client.config "$@"

scripts/calico/upgrade.py

@@ -168,7 +168,10 @@ def mark_apply_needed(lock_file):
     """
     Remove the lock file provided so the apiserver kicker will re apply the CNI manifest
     """
-    os.remove(lock_file)
+    try:
+        os.remove(lock_file)
+    except OSError:
+        pass
 
 
 def main():

scripts/inspect.sh

@@ -467,7 +467,11 @@ then
   check_service $svc_flanneld
   check_service $svc_etcd
 else
-  check_service $svc_dqlite
+  if ! [ -e "${SNAP_DATA}/var/lock/no-k8s-dqlite" ]
+  then
+    # workers do not run dqlite
+    check_service $svc_dqlite
+  fi
 fi
 
 if ! [ -e "${SNAP_DATA}/var/lock/no-apiserver-proxy" ]

scripts/wrappers/join.py

@@ -778,6 +778,23 @@ def update_apiserver_proxy(master_ip, api_port):
     service("restart", "apiserver-proxy")
 
 
+def print_worker_usage():
+    """
+    Print Worker usage
+    """
+    print("")
+    print("The node has joined the cluster and will appear in the nodes list in a few seconds.")
+    print("")
+    print("This worker node gets automatically configured with the API server endpoints.")
+    print(
+        "If the API servers are behind a loadbalancer please set the '--refresh-interval' to '0s' in:"
+    )
+    print("    /var/snap/microk8s/current/args/apiserver-proxy")
+    print("and replace the API server endpoints with the one provided by the loadbalancer in:")
+    print("    /var/snap/microk8s/current/args/traefik/provider.yaml")
+    print("")
+
+
 def join_dqlite_worker_node(info, master_ip, master_port, token):
     """
     Join this node as a worker to a cluster running dqlite.
@@ -806,6 +823,7 @@ def join_dqlite_worker_node(info, master_ip, master_port, token):
     update_apiserver_proxy(master_ip, info["apiport"])
     mark_worker_node()
     mark_no_cert_reissue()
+    print_worker_usage()
 
 
 def join_dqlite_master_node(info, master_ip, token):