From aacb16f1d4c66e8c332507682d442b01c46458ae Mon Sep 17 00:00:00 2001
From: andrewli315 <nyps70414@gmail.com>
Date: Tue, 9 Apr 2024 16:01:19 +0000
Subject: [PATCH] cp to user's home and generate the join cp cmd

---
 k8s-install.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/k8s-install.sh b/k8s-install.sh
index e84170b..9d1e0c1 100755
--- a/k8s-install.sh
+++ b/k8s-install.sh
@@ -206,16 +206,15 @@ eval "systemctl enable --now kubelet"
 eval "kubeadm init --v=5 --config=/opt/deploy/k8s/kubeadm-config.yaml \
     --skip-phases=addon/kube-proxy"
 export HOME=/home/prlab
-mkdir -p $HOME/.kube
-cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
-chown $(id -u):$(id -g) $HOME/.kube/config
 
 
 }
 copy_k8s_config(){
+  export HOME=/home/prlab
+  export USER=prlab
   mkdir -p $HOME/.kube  
   cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
-  chown $(id -u):$(id -g) $HOME/.kube/config
+  chown -R $USER:$USER $HOME/.kube/
 
 }
 copy_host_file(){
@@ -227,8 +226,9 @@ copy_host_file(){
 }
 
 add_to_master(){
-    echo "Add node to CP"
-    #$key=kubeadm token create --print-join-command
+    echo "Add node to CP cmd"
+    cmd=$(kubeadm token create --print-join-command)
+    echo $cmd
 }
 
 main(){
@@ -239,10 +239,12 @@ main(){
 	echo "Installing"
         copy_host_file $1
     if [[ $2 == "cp" ]]; then
-	    prerequisite
-	    install_cri
-	    install_k8s
-	    copy_k8s_config
+#	    prerequisite
+#	    install_cri
+#	    install_k8s
+	    #echo "COPY K8S Config"
+	    #copy_k8s_config
+	    add_to_master
     else 
         add_to_master
     fi
-- 
2.26.0