fix bug

tingweiwang
Commit 1dd2ca12 authored Aug 25, 2020 by tingweiwang
Showing with 40 additions and 40 deletions
config/daemon.json
script/k8s/backup/1-init.sh
script/k8s/bootstrap.kubeconfig
script/k8s/kube-proxy.kubeconfig
script/seetaas/start_server.sh
--- a/config/daemon.json
+++ b/config/daemon.json
-{
-    "registry-mirrors": ["https://hub-mirror.c.163.com","https://rrkngb5t.mirror.aliyuncs.com"],
-    "insecure-registries":["harbor_host"]
-}
--- a/script/k8s/backup/1-init.sh
+++ b/script/k8s/backup/1-init.sh
 #!/bin/bash
 #wangtingwei
-#yum源配置
-:<<!
-cat > /etc/apt/sources.list << EOF
-# 默认注释了源码镜像以提高 apt update 速度，如有需要可自行取消注释
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ xenial main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ xenial-updates main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ xenial-backports main restricted universe multiverse
-deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ xenial-security main restricted universe multiverse
-EOF
-#dns解析配置
-echo "nameserver 114.114.114.114" >>/etc/resolv.conf  
-!
-#apt update 
-#apt  install lrzsz  vim  ntpdate wget curl   dstat  htop  lsof iotop sysstat zip unzip bzip2  -y
-#apt install gcc g++  make cmake autoconf  net-tools -y
-##################################################################################################
-
-
 #关闭防火墙
    systemctl stop ufw.service
    systemctl disable ufw.service
@@ -74,8 +56,7 @@ EOF
    fs.inotify.max_user_watches=1048576 
 EOF
    modprobe br_netfilter && /sbin/sysctl -p && echo "sysctl set OK!!"
-echo "make k8s  dir  success"
-cd /root/k8s/bin/ && cp cfssl cfssl-certinfo  cfssljson
+#cd /root/k8s/bin/ && cp cfssl cfssl-certinfo  cfssljson
 ########################change bash##############################
 echo "+++++++++++++++++++++++++++++change bash++++++++++++++++++++++++++++++"
 rm -rf /bin/sh && ln -s /bin/bash  /bin/sh 
--- a/script/k8s/bootstrap.kubeconfig
+++ b/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: 144af0917d244fd134b3136e00fe6e1c
--- a/script/k8s/kube-proxy.kubeconfig
+++ b/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==
--- a/script/seetaas/start_server.sh
+++ b/script/seetaas/start_server.sh
@@ -26,22 +26,8 @@ service redis-server restart
 echo "start mongo"
 service mongodb restart
 ###################################################################
-echo "===================== autodl-core ==================="
-cd $workspace/src/autodl-core && make private_deploy  mode=dev
-sleep 5
-echo "===================== user-center-frontend ==================="
-cd $workspace/user-center && make private_deploy  mode=dev
-sleep 5
-echo "===================== user-center backend ==================="
-cd $workspace/src/user-center && make private_deploy mode=dev
-sleep 5
-echo "===================== seetaas-v3 ==================="
-cd $workspace/seetaas-v3 && make private_deploy  mode=dev
-sleep 5
-echo "===================== seetaas-backend ==================="
-cd $workspace/src/seetaas-backend && make private_deploy mode=dev
-echo "===================== kpl-stream ==================="
-cd $workspace/src/kpl-stream && make private_deploy mode=dev
+echo "重新启动业务服务"
+sh /root/k8s/script/seetaas/5-seetaas-start.sh
 ###################################################
 echo "wait 20s for start all server"
 sleep 20