Merge branch 'main' of git.service.wiseadvice.eu:wiseadvice_public_repos/wa_public_init_repo

init.sh

@@ -2,9 +2,6 @@
 WA_REPO=$HOME/wa_repos
 
 
-
-
-
 echo "################################################"
 echo "         basic init of wiseadvice node          "
 echo "################################################"
@@ -68,11 +65,16 @@ function start_ssh_agent(){
 
 
 
+
+
+function init_repos(){
+
   if [ -d "$WA_REPO" ]; then
     echo "$WA_REPO does exist, skipping cloning"
     source $WA_REPO/export_client_name.sh
     echo "found client name: $CLIENT_NAME"
     source $HOME/.zshrc
+    
     git_pull
   else
     echo -n "client name: "
@@ -95,21 +97,21 @@ else
 
       ssh-keygen -t rsa -N "$passphrase" -C "deploy_key_$CLIENT_NAME" -f $HOME/.ssh/deploy_key
 
-    echo "please upload now pub key bay logging into user $CLIENT_NAME keys ..."
+      echo "please upload now pub key by logging into user $CLIENT_NAME keys ..."
+      echo "if user does not exit. login with admin user and create new user with name: $CLIENT_NAME"
+      echo "make sure the user $CLIENT_NAME is in team shared_deployments and is allowed to pull repository cimp_$CLIENT_NAME"
 
-    echo "firefox https://git.service.wiseadvice.eu/user/settings/keys"
+
+      echo "https://git.service.wiseadvice.eu/user/settings/keys"
       echo " "
 
       cat $HOME/.ssh/deploy_key.pub
     fi
 
-
-
     echo " "
     echo -n "ready to pull? type yes: "
     read -r ready_to_pull
 
-
     if [ "$ready_to_pull" = "yes" ]; then
       start_ssh_agent
 
@@ -147,18 +149,24 @@ EOT
       ln -sf $WA_REPO/cimp_$CLIENT_NAME/k8s $HOME/kubeconfs
 
       echo "source .zshrc after pull"
+      echo "change default SHELL of user sysadmin:"
+      chsh -s /usr/bin/zsh
       source $HOME/.zshrc
     else
       echo "Aborting"
       exit 0
     fi
   fi
+}
+
+
 
 mainmenu() {
     echo -ne "
 MAIN MENU
 1) Init Master
 2) Join Worker
+3) Reset Cluster and start over again
 0) Exit
 Choose an option:  "
     read -r ans
@@ -173,6 +181,9 @@ Choose an option:  "
       echo "initializing K8s Worker Set-Up"
       source $WA_REPO/shared_resources_k8s/k8s/init_worker.sh
       ;;
+    3)
+      kubeadm_reset
+      ;;
     0)
       echo "Bye bye."
       exit 0
@@ -184,4 +195,5 @@ Choose an option:  "
     esac
 }
 
+init_repos
 mainmenu