Merge branch 'v2.0.0' of https://github.com/fanux/sealos into v2.0.0

Author: fanux

cmd/clean.go

@@ -25,7 +25,7 @@ var cleanCmd = &cobra.Command{
 	Short: "Simplest way to clean your kubernets HA cluster",
 	Long:  `sealos clean --master 192.168.0.2 --master 192.168.0.3 --master 192.168.0.4 --node 192.168.0.5 --user root --passwd your-server-password`,
 	Run: func(cmd *cobra.Command, args []string) {
-		i := install.BuildInstaller(install.User, install.Passwd, masters, nodes)
+		i := install.BuildInstaller(masters, nodes)
 		i.CleanCluster()
 	},
 }

cmd/init.go

@@ -30,7 +30,7 @@ var initCmd = &cobra.Command{
 	Short: "Simplest way to init your kubernets HA cluster",
 	Long:  `sealos init --master 192.168.0.2 --master 192.168.0.3 --master 192.168.0.4 --node 192.168.0.5 --user root --passwd your-server-password`,
 	Run: func(cmd *cobra.Command, args []string) {
-		i := install.BuildInstaller(install.User, install.Passwd, masters, nodes)
+		i := install.BuildInstaller(masters, nodes)
 		i.InstallMaster0()
 		i.JoinMasters()
 		i.JoinNodes()
@@ -51,6 +51,7 @@ func init() {
 	// initCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 	initCmd.Flags().StringVar(&install.User, "user", "root", "servers user name for ssh")
 	initCmd.Flags().StringVar(&install.Passwd, "passwd", "passwd", "password for ssh")
+	initCmd.Flags().StringVar(&install.VIP, "vip", "10.103.97.2", "virtual ip")
 
 	initCmd.Flags().StringSliceVar(&masters, "master", []string{}, "kubernetes masters")
 	initCmd.Flags().StringSliceVar(&nodes, "node", []string{}, "kubernetes nodes")

install/sealos.go

@@ -17,9 +17,6 @@ type Installer interface {
 
 //SealosInstaller is
 type SealosInstaller struct {
-	User   string
-	Passwd string
-
 	Masters []string
 	Nodes   []string
 
@@ -29,10 +26,8 @@ type SealosInstaller struct {
 }
 
 //BuildInstaller is
-func BuildInstaller(user string, passwd string, masters []string, nodes []string) Installer {
+func BuildInstaller(masters []string, nodes []string) Installer {
 	return &SealosInstaller{
-		User:    user,
-		Passwd:  passwd,
 		Masters: masters,
 		Nodes:   nodes,
 	}
@@ -43,7 +38,10 @@ func (s *SealosInstaller) InstallMaster0() {
 	cmd := fmt.Sprintf("echo %s apiserver.cluster.local >> /etc/hosts", s.Masters[0])
 	Cmd(s.Masters[0], cmd)
 
-	cmd = `kubeadm init --config=kubeadm-config.yaml --experimental-upload-certs`
+	cmd = "echo \"" + string(Template(s.Masters, VIP)) + "\" > ~/kubeadm-config.yaml"
+	Cmd(s.Masters[0], cmd)
+
+	cmd = `kubeadm init --config=~/kubeadm-config.yaml --experimental-upload-certs`
 	output := Cmd(s.Masters[0], cmd)
 	s.decodeOutput(output)
 
@@ -79,9 +77,9 @@ func (s *SealosInstaller) JoinNodes() {
 		wg.Add(1)
 		go func(node string) {
 			defer wg.Done()
-			cmdHosts := fmt.Sprintf("echo 10.103.97.2 apiserver.cluster.local >> /etc/hosts")
+			cmdHosts := fmt.Sprintf("echo %s apiserver.cluster.local >> /etc/hosts", VIP)
 			Cmd(node, cmdHosts)
-			cmd := fmt.Sprintf("kubeadm join 10.103.97.2:6443 --token %s --discovery-token-ca-cert-hash %s", s.JoinToken, s.TokenCaCertHash)
+			cmd := fmt.Sprintf("kubeadm join %s:6443 --token %s --discovery-token-ca-cert-hash %s", VIP, s.JoinToken, s.TokenCaCertHash)
 			cmd += masters
 			Cmd(node, cmd)
 		}(node)

install/utils.go

@@ -1,7 +1,9 @@
 package install
 
 import (
+	"bytes"
 	"fmt"
+	"html/template"
 	"net"
 	"time"
 
@@ -12,6 +14,7 @@ import (
 var (
 	User   string
 	Passwd string
+	VIP    string
 )
 
 //Cmd is
@@ -76,3 +79,37 @@ func Connect(user, passwd, host string) (*ssh.Session, error) {
 
 	return session, nil
 }
+
+//Template is
+func Template(masters []string, vip string) []byte {
+	var templateText = string(`apiVersion: kubeadm.k8s.io/v1beta1
+kind: ClusterConfiguration
+kubernetesVersion: v1.14.0
+controlPlaneEndpoint: "apiserver.cluster.local:6443"
+apiServer:
+        certSANs:
+ 		- 127.0.0.1
+		- apiserver.cluster.local
+		{{range .Masters -}}
+		- {{.}}
+		{{end -}}
+		- {{.VIP}}
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+mode: "ipvs"
+ipvs:
+        excludeCIDRs: 
+        - "{{.VIP}}/32"`)
+	tmpl, err := template.New("text").Parse(templateText)
+	if err != nil {
+		fmt.Println("template parse failed:", err)
+		panic(1)
+	}
+	var envMap = make(map[string]interface{})
+	envMap["VIP"] = vip
+	envMap["Masters"] = masters
+	var buffer bytes.Buffer
+	_ = tmpl.Execute(&buffer, envMap)
+	return buffer.Bytes()
+}