sleep 30

labring · Apr 11, 2019 · 4d54805 · 4d54805
1 parent 96fe90a
commit 4d54805
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/install/sealos.go b/install/sealos.go
@@ -48,13 +48,13 @@ func (s *SealosInstaller) InstallMaster0() {
 	cmd = `mkdir -p ~/.kube && cp /etc/kubernetes/admin.conf ~/.kube/config`
 	output = Cmd(s.Masters[0], cmd)
 
-	cmd = `kubectl apply -f net/calico.yaml`
+	cmd = `kubectl apply -f net/calico.yaml || true`
 	output = Cmd(s.Masters[0], cmd)
 }
 
 //JoinMasters is
 func (s *SealosInstaller) JoinMasters() {
-	time.Sleep(3 * time.Second)
+	time.Sleep(30 * time.Second)
 	cmd := fmt.Sprintf("kubeadm join %s:6443 --token %s --discovery-token-ca-cert-hash %s --experimental-control-plane --certificate-key %s", s.Masters[0], s.JoinToken, s.TokenCaCertHash, s.CertificateKey)
 
 	for _, master := range s.Masters[1:] {

diff --git a/install/utils.go b/install/utils.go
@@ -19,6 +19,7 @@ func Cmd(host string, cmd string) []byte {
 	session, err := Connect(User, Passwd, host)
 	if err != nil {
 		fmt.Println("	Error create ssh session failed", err)
+		panic(1)
 		return []byte{}
 	}
 	defer session.Close()
@@ -29,6 +30,7 @@ func Cmd(host string, cmd string) []byte {
 	fmt.Printf("%s\n\n", b)
 	if err != nil {
 		fmt.Println("	Error exec command failed", err)
+		panic(1)
 		return []byte{}
 	}
 	return b