新增下载nfs-common，sed-upper.sh增加recover参数

script/autodl/2-replace-file.sh

@@ -20,7 +20,7 @@ redis_host=INTRANET_IP:6379
 redis_password=seetatech
 mongo_host='mongodb://admin:admin@INTRANET_IP:27017/seetaas?authSource=admin'     #&号前记得加转义
 harbor_host=INTRANET_IP:5000
-hb_host=INTRANET_IP:5000
+hb_host=INTRANET_IP:5000  #如果是私有部署则共用一个私有harbor,如果是 公用部署则改成hb.seetatech.com
 ###############################修改后端app.yaml################################
 sudo sed -i s/redis_host/$redis_host/g `find $workspace -type f -name app.yaml`
 sudo sed -i s/mysql_host/$mysql_host/g `find $workspace -type f -name app.yaml`

script/autodl/nfs-install.sh

@@ -19,7 +19,7 @@ df -h |grep /dev/md5 && echo "raid5挂载成功，挂载路径是/storage/nfs"
 #mdadm -As /dev/md5      # assemble md5
 ##################部署nfs####################
 apt install nfs-kernel-server nfs-common
-echo "$nfs_path *(rw,sync,no_root_squash)" >>/etc/exports
+echo "$nfs_path *(rw,async,no_root_squash)" >>/etc/exports
 /etc/init.d/nfs-kernel-server restart
 #apt install nfs-common
 #sudo mount -t nfs 192.168.1.242:/mnt/md5 [NFS_MNT_CLIENT_LOC]

script/k8s/add_node.sh

@@ -49,7 +49,8 @@ ansible new_node  -m shell -a "service docker status"
 ansible new_node -m shell -a "cat /etc/docker/daemon.json"
 echo "还原daemon.json模板文件"
 sed -i s/$harbor_host/harbor_host/g /root/k8s/config/daemon.json
-
+###################################################################################
+ansible new_node -m shell -a "apt install nfs-common --allow-unauthenticated"
 ###########################################################################################
 ansible new_node -m copy -a "src=/root/k8s/bin/kube-proxy dest=/opt/kubernetes/bin/ mode=777"
 ansible new_node -m copy -a "src=/root/k8s/bin/kubelet dest=/opt/kubernetes/bin/ mode=777"

script/k8s/bootstrap.kubeconfig

-apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR2akNDQXFhZ0F3SUJBZ0lVRHZSbjF6MnVBU291NnZxcGYyb3N1YUVLcjljd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1pURUxNQWtHQTFVRUJoTUNRMDR4RURBT0JnTlZCQWdUQjBKbGFVcHBibWN4RURBT0JnTlZCQWNUQjBKbAphVXBwYm1jeEREQUtCZ05WQkFvVEEyczRjekVQTUEwR0ExVUVDeE1HVTNsemRHVnRNUk13RVFZRFZRUURFd3ByCmRXSmxjbTVsZEdWek1CNFhEVEU1TURReU5qQTFNVE13TUZvWERUSTBNRFF5TkRBMU1UTXdNRm93WlRFTE1Ba0cKQTFVRUJoTUNRMDR4RURBT0JnTlZCQWdUQjBKbGFVcHBibWN4RURBT0JnTlZCQWNUQjBKbGFVcHBibWN4RERBSwpCZ05WQkFvVEEyczRjekVQTUEwR0ExVUVDeE1HVTNsemRHVnRNUk13RVFZRFZRUURFd3ByZFdKbGNtNWxkR1Z6Ck1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBcDhpZnRTbWdTV2lDZ0w3M2tiZjQKQnVpclJpSzhaVy85ZS9iaFdlWEM1OGtBSUYzajYrRzRaMjhhVE9od1lJOFZaNkVMNEdLUUFqOG1BeWhLYXZBMQpmRXhhYjJXeVNlNVBkSExrczgyTDNsRDMrZVRjNktCMXM3RmtOMndyQmNBTml5b2RDQms2cmt6UW5uY20yYVUzCnFPYTBOdVZRb0lpYU16YmV4TktlaG55aXJFOGgzVDdYR05pdHpFMU53cFNsYVdDeTd1MWdZSTY1TTlqZWFRTG4KUDBTOE04cU04dlJCWDZuODJlaVpqd2JVSnp6bXZlSU0yZUpkODN3SytqTzBwTmpHMW53ZzBYbk5wS2RXTjJINQp2U3liMUhJWG9ISWF5eTVIZDRna282ZE0yQWNwblZVU0VUOVR2QkxBMnJCOVVRY0UxR25oOTVzNTNrdXp3dkJaCnR3SURBUUFCbzJZd1pEQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCL3dJQkFqQWQKQmdOVkhRNEVGZ1FVaDBRdFRaYzBYVXBrd3RGR0EvVzRsNEJyOERvd0h3WURWUjBqQkJnd0ZvQVVoMFF0VFpjMApYVXBrd3RGR0EvVzRsNEJyOERvd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJY0FJRUI1TDc0TjZTZU1nMW9rCkY2TGRPY2c2d1NXMGp1NGZNOUZoN3ZuVmlrVFhtK2VBQ0dCcWhySXpCOVd3bjZGWWplaTdIMCtMSUJJU2dyQmgKVXk0dFZRckczZUdBQTY3Q3diQzhhQy9vYlhTNkJBZnliZWdJbUpJcGNrNEd6RExqaUF4WTBnaml2aE5adzhwdQp2N0lXT2FKcUM0ZUxoOG4wQzZ6MXhaMENWV1dLRjFRT2o4VmUvcmptSzkvUUdta3I1MHpJUzV5RDRrL2hpdzE3CklMWUJmZFRHQWtxOFk2R01XcEtRMGxDdTJ6NXBjdW91WVlycTc4MytwU1hMcVY0b2tuWlA1aHk4TktBdVFxbkEKZTNmekoyMm94VGN3VTY0eUQwQXU5Z3hXYW5INFFpbmpObGx5WCtrK2FmYmxiMURSdFFxalF0TmdBdGZ3a1M4ZQpxV3c9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-    server: https://192.168.1.32:6443
-  name: kubernetes
-contexts:
-- context:
-    cluster: kubernetes
-    user: kubelet-bootstrap
-  name: default
-current-context: default
-kind: Config
-preferences: {}
-users:
-- name: kubelet-bootstrap
-  user:
-    token: c5d5a11e13492748800f4fba7b687623

script/k8s/deploy-gpu-k8s.sh

@@ -13,7 +13,7 @@ interface=eno1 #本机IP的物理网卡名称，用于flannel的配置。
 ########################################################################################
 echo "开始安装ansbile"
 apt  update  --allow-insecure-repositories
-apt install  sshpass  ansible -y --allow-unauthenticated
+apt install nfs-common  sshpass  ansible -y --allow-unauthenticated
 echo "拷贝ansible-hosts文件"
 cp -a  /root/k8s/config/ansible-hosts /etc/ansible/hosts
 echo "渲染修改ansible hosts"

script/k8s/kube-proxy.kubeconfig

-apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR2akNDQXFhZ0F3SUJBZ0lVRHZSbjF6MnVBU291NnZxcGYyb3N1YUVLcjljd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1pURUxNQWtHQTFVRUJoTUNRMDR4RURBT0JnTlZCQWdUQjBKbGFVcHBibWN4RURBT0JnTlZCQWNUQjBKbAphVXBwYm1jeEREQUtCZ05WQkFvVEEyczRjekVQTUEwR0ExVUVDeE1HVTNsemRHVnRNUk13RVFZRFZRUURFd3ByCmRXSmxjbTVsZEdWek1CNFhEVEU1TURReU5qQTFNVE13TUZvWERUSTBNRFF5TkRBMU1UTXdNRm93WlRFTE1Ba0cKQTFVRUJoTUNRMDR4RURBT0JnTlZCQWdUQjBKbGFVcHBibWN4RURBT0JnTlZCQWNUQjBKbGFVcHBibWN4RERBSwpCZ05WQkFvVEEyczRjekVQTUEwR0ExVUVDeE1HVTNsemRHVnRNUk13RVFZRFZRUURFd3ByZFdKbGNtNWxkR1Z6Ck1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBcDhpZnRTbWdTV2lDZ0w3M2tiZjQKQnVpclJpSzhaVy85ZS9iaFdlWEM1OGtBSUYzajYrRzRaMjhhVE9od1lJOFZaNkVMNEdLUUFqOG1BeWhLYXZBMQpmRXhhYjJXeVNlNVBkSExrczgyTDNsRDMrZVRjNktCMXM3RmtOMndyQmNBTml5b2RDQms2cmt6UW5uY20yYVUzCnFPYTBOdVZRb0lpYU16YmV4TktlaG55aXJFOGgzVDdYR05pdHpFMU53cFNsYVdDeTd1MWdZSTY1TTlqZWFRTG4KUDBTOE04cU04dlJCWDZuODJlaVpqd2JVSnp6bXZlSU0yZUpkODN3SytqTzBwTmpHMW53ZzBYbk5wS2RXTjJINQp2U3liMUhJWG9ISWF5eTVIZDRna282ZE0yQWNwblZVU0VUOVR2QkxBMnJCOVVRY0UxR25oOTVzNTNrdXp3dkJaCnR3SURBUUFCbzJZd1pEQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0VnWURWUjBUQVFIL0JBZ3dCZ0VCL3dJQkFqQWQKQmdOVkhRNEVGZ1FVaDBRdFRaYzBYVXBrd3RGR0EvVzRsNEJyOERvd0h3WURWUjBqQkJnd0ZvQVVoMFF0VFpjMApYVXBrd3RGR0EvVzRsNEJyOERvd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJY0FJRUI1TDc0TjZTZU1nMW9rCkY2TGRPY2c2d1NXMGp1NGZNOUZoN3ZuVmlrVFhtK2VBQ0dCcWhySXpCOVd3bjZGWWplaTdIMCtMSUJJU2dyQmgKVXk0dFZRckczZUdBQTY3Q3diQzhhQy9vYlhTNkJBZnliZWdJbUpJcGNrNEd6RExqaUF4WTBnaml2aE5adzhwdQp2N0lXT2FKcUM0ZUxoOG4wQzZ6MXhaMENWV1dLRjFRT2o4VmUvcmptSzkvUUdta3I1MHpJUzV5RDRrL2hpdzE3CklMWUJmZFRHQWtxOFk2R01XcEtRMGxDdTJ6NXBjdW91WVlycTc4MytwU1hMcVY0b2tuWlA1aHk4TktBdVFxbkEKZTNmekoyMm94VGN3VTY0eUQwQXU5Z3hXYW5INFFpbmpObGx5WCtrK2FmYmxiMURSdFFxalF0TmdBdGZ3a1M4ZQpxV3c9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-    server: https://192.168.1.32:6443
-  name: kubernetes
-contexts:
-- context:
-    cluster: kubernetes
-    user: kube-proxy
-  name: default
-current-context: default
-kind: Config
-preferences: {}
-users:
-- name: kube-proxy
-  user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQzakNDQXNhZ0F3SUJBZ0lVZDYrWnU4MENkMGQ4Z2dJcTZqR3hwbXp1VjhBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1pURUxNQWtHQTFVRUJoTUNRMDR4RURBT0JnTlZCQWdUQjBKbGFVcHBibWN4RURBT0JnTlZCQWNUQjBKbAphVXBwYm1jeEREQUtCZ05WQkFvVEEyczRjekVQTUEwR0ExVUVDeE1HVTNsemRHVnRNUk13RVFZRFZRUURFd3ByCmRXSmxjbTVsZEdWek1CNFhEVEU1TURVd056QTNOVEV3TUZvWERUSTVNRFV3TkRBM05URXdNRm93YkRFTE1Ba0cKQTFVRUJoTUNRMDR4RURBT0JnTlZCQWdUQjBKbGFVcHBibWN4RURBT0JnTlZCQWNUQjBKbGFVcHBibWN4RERBSwpCZ05WQkFvVEEyczRjekVQTUEwR0ExVUVDeE1HVTNsemRHVnRNUm93R0FZRFZRUURFeEZ6ZVhOMFpXMDZhM1ZpClpTMXdjbTk0ZVRDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTXBaSjZqcElCYjYKbVlnVWo5ejR3SVdxU1N3QnpOZmIwd3l6TnprY2tza2dlK2lmN1VkTUYrUDlWOHZkVHRFTW92KzRCMFlMamgyegpMbDQ1NWhpNkNxYUdxZFBxSEFIYnVURHpYRC9CNStnVnZGUlEzanZVK2tSeXVvSDJYVlFBZUgyYXJnclVTOS9SCjh2R3IwTHNIemhVV2ZWY3pWT2VRZDZEdzRvNUJ2WjQyWnNxeWd1ZzIzKzY4V01neFJSUFpMdEVJcHE2T1BYQTYKNEJ3QTJlaWhtMmhDclZ3MlVzbm9vcDZ5T0ZMTFdxemtHTlNjK0dXSCtacDNiSU5JRnRDeEl1UGp2bXNlekpyMQpYN0hxcGd0NnlvTVJSNlRqU0tHOU1ZdGNxL1kvMHRkZ1htck5JNWtybGQ1SzZrRElteE9kTTZXajhYZ20rZGJGCjBVUGVNUHB3TDMwQ0F3RUFBYU4vTUgwd0RnWURWUjBQQVFIL0JBUURBZ1dnTUIwR0ExVWRKUVFXTUJRR0NDc0cKQVFVRkJ3TUJCZ2dyQmdFRkJRY0RBakFNQmdOVkhSTUJBZjhFQWpBQU1CMEdBMVVkRGdRV0JCU0NVZXQxbzA4YQpSQmpBZFVUOWYrVGo2QnFIMGpBZkJnTlZIU01FR0RBV2dCU0hSQzFObHpSZFNtVEMwVVlEOWJpWGdHdndPakFOCkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWMwVGEyZlI2V3l3bkZyMURxU1E1c2VhdFhHVVFZR1VZdTVFeTdoVGkKTko0eHQrejNETzJsZnlqRExCVXRsUEloYjdocWNEVmQ4V1YvOVRSMStjaVQvTk5WQUtFU0xwRmdQeEtxM00rNwpaR0VTSlNibVFKMFdqVmNrYmp5aWs3MzRjcm95TXFZd0JrM3hZWmMxbFBycG1YMWVxeUk5eHZ0T0tjejErdFNFCjRVdkx6WjcrbkFMMXNXMWlEekZBcFFDak9VSzVqdms5MmFvN254azZJaFhnc0laUnFFNzVFdjFGc1RQUTlrNnAKT2RROHFOWDM4d2NMODhKeFpoc0oxTkhlQ1pLSkN5azNETm5TS3ByTUVYUllZeWRUUzcwWjFTZW93NUhrL1FocgpWYlplSGNSWkFxNFVwUXBCaWlQY1BvRDJ2WWl4RXFYZkFFeG1MQ2kxcUtUcXpRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBeWxrbnFPa2dGdnFaaUJTUDNQakFoYXBKTEFITTE5dlRETE0zT1J5U3lTQjc2Si90ClIwd1g0LzFYeTkxTzBReWkvN2dIUmd1T0hiTXVYam5tR0xvS3BvYXAwK29jQWR1NU1QTmNQOEhuNkJXOFZGRGUKTzlUNlJISzZnZlpkVkFCNGZacXVDdFJMMzlIeThhdlF1d2ZPRlJaOVZ6TlU1NUIzb1BEaWprRzlualpteXJLQwo2RGJmN3J4WXlERkZFOWt1MFFpbXJvNDljRHJnSEFEWjZLR2JhRUt0WERaU3llaWluckk0VXN0YXJPUVkxSno0ClpZZjVtbmRzZzBnVzBMRWk0K08rYXg3TW12VmZzZXFtQzNyS2d4RkhwT05Jb2IweGkxeXI5ai9TMTJCZWFzMGoKbVN1VjNrcnFRTWliRTUwenBhUHhlQ2I1MXNYUlE5NHcrbkF2ZlFJREFRQUJBb0lCQUJrOW04dmZJS2lkSSsrcwptUEY0ZWhOeVZXUk82UzEzOTFDYlBtVTZZamtDZTFKZU9LdnZHdi9PaDFnZnlBZ2RxbXQ1bWphcmxGT3lHVE9aCngxRUlTL0hQMUhsaHQ1S254T2NOUkZHVHI0anN4U3hEVmlWaWdNRnZDa0xSNTN4bC9xRzBYTWR2Q2ZQbWJZYWwKNXdpZGhhQnR5TDdLNFdsdFJPN25mV3MvV2hiVSt6NWxFM1ovWjZwOVQreXNIRXBqTWpCMWNyNFAvQ09zNEJnWApnUUFSVzVQK2hvTzJNQlZXK2pGRHhOOVpNNXFLeVZINTgwU2MvdGYxd3p4RU1scHNZNFkyeFlQNEVOcWZxTGNECnJ0UTVVN2V5SW83N2diV0ljNVpFWDFUN1NtcGlQNlQyaHowdDFnLzBUWTB0cDhseElBZVhYMTc5cVZnNy96TG8KeFdqKzBFRUNnWUVBeXNaQm43RkxTWmVHMkR1dzRJN0Q4eC9LbGtubjBqMzZoOU1lMTRmVnFJR1EyeVhhcS92eApXNmd6NmpDUVpianVKc0V4eHM2bjZBejhZWlU5TTNtaUM3WHNLL1JuQm1aSG1SdjhkSFpsUjZ6L3BPWnN4ck4wClM5aTM4OUZZOEEyeGRYcjYxS0xlQUVwSkpBQllhZHRNQzNJN0toUkQxT0xWRng1cjEzeGprOUVDZ1lFQS8zWkMKeTkzdFhmb2NOODM2NWVYVXZOQ1puMnlNeS9oaGU3djZYcFUwN1lFQytVRXp5MFVlRjFNLzQrRFhvSkV1V1NRUgo0QzhlMXo3Y2JSbjJ3N0ZKRm1pOGJUVUFOaHFiMGxiSmQxTGhGM1RYS2FVd2p6MEpjd2Y2WU51ekJBMzEzbWlKCkRtNWN3N1l4QTAwRk9LdC9ETThnU1MzdU9DYjVHeUc0bkVOanArMENnWUVBaWlvaVp0eFlMMUczQ0xsTFlRY0cKRHkvM1N3WWFsayt5MkQrTFFWS0Z5NlpVL0czRG5QSXpWNys1ZC9ZVlBhcVBZd3E2anZzYXYydXh3QS8vUG9hLwpXbmxmN2VjL0Y4WXpQT2tyMEhNbnVYbndTdnpTMjJWRmRiUzZTc0MzZUFIc2k5NzY4RTMxTkg5cGJNVnJlTjE2CjZFV3llSTZNVlk4bG9QWVNoeVp6ZHpFQ2dZQThmeVVTWWx2MEJXYnBVRDQ2YzFNTjQ5aDlpSmRQTm1MZmlvU2cKSVhXSFNTWUxJUVhDL1h0Q3l0UTJndWlOZmRRY0NBNnpxSFVGUkQydkdKYjNnT1J1Q2grVlBSZnZ1QjF1a2w3agpneDBMRVFCalBGdGprSERNYlBjK09Na01ETUpOQ1RScjFuYmhZaVA1UkNRWVo0U080LzRoVmw4enJRY1JCY3RTCk5pTkRnUUtCZ0JTS1Z3VDdINUxMWS9qVnE4Sk5HTFZRNXZ4WWxTdVRYQzhYSkhPUDQ5dzV5dlY1eERORDdhUE0KV1hjOGR6aDdQNE5PTG1yL1UwL0xYQzhrdGx4UU1Xai94N3J5ZitFQk0rNVJhK2pab0ViN0xhUHQ2d2MwSGM0UApMWEY1dHo1dENRbVo5V1FXL1pGZGUwMXNYYlJSWFFRdkVvdE1QNVhMd1dDN1FpRlA2TDZpCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==

script/sed-upper.sh

@@ -14,15 +14,31 @@ function autodl_sed() {
 sed -i s/PUBLIC_IP/$PUBLIC_IP/g autodl/2-replace-file.sh
 sed -i s/INTRANET_IP/$INTRANET_IP/g autodl/2-replace-file.sh
 }
+
+
+function seetaas_recover() {
+sed -i s/$PUBLIC_IP/PUBLIC_IP/g seetaas/2-replace-file.sh
+sed -i s/$INTRANET_IP/INTRANET_IP/g seetaas/2-replace-file.sh
+}
+
+function autodl_recover() {
+sed -i s/$PUBLIC_IP/PUBLIC_IP/g autodl/2-replace-file.sh
+sed -i s/$INTRANET_IP/INTRANET_IP/g autodl/2-replace-file.sh
+}
 case $1 in
-seetaas)
-  seetaas_sed
+seetaas_sed)
+  seetaas_sed  
   ;;
-autodl)
+autodl_sed)
   autodl_sed
   ;;
+seetaas_recover)
+  seetaas_recover
+  ;;
+autodl_recover)
+  autodl_recover
+  ;;
 *)
-  echo "please input (seetaas|autodl)"
+  echo "please input (seetaas_sed|autodl_sed|seetaas_recover|autodl_recover)"
 esac
 
-

script/seetaas/2-replace-file.sh

@@ -21,7 +21,7 @@ redis_host=INTRANET_IP:6379
 redis_password=seetatech
 mongo_host='mongodb://admin:admin@INTRANET_IP:27017/seetaas?authSource=admin'     #&号前记得加转义
 harbor_host=INTRANET_IP:5000
-hb_host=INTRANET_IP:5000
+hb_host=INTRANET_IP:5000 #如果是私有部署则共用一个私有harbor,如果是 公用部署则改成hb.seetatech.com
 ###############################修改后端app.yaml################################
 sudo sed -i s/redis_host/$redis_host/g `find $workspace -type f -name app.yaml`
 sudo sed -i s/mysql_host/$mysql_host/g `find $workspace -type f -name app.yaml`