feat(develop): fix ipip param not set false (#653)

cmd/init.go

@@ -130,7 +130,7 @@ func init() {
 
 	initCmd.Flags().BoolVar(&install.WithoutCNI, "without-cni", false, "If true we not install cni plugin")
 	initCmd.Flags().StringVar(&install.Network, "network", "calico", "cni plugin, calico..")
-	initCmd.Flags().BoolVar(&install.IPIP, "ipip", true, "ipip mode enable, calico..")
+	initCmd.Flags().BoolVar(&install.BGP, "bgp", false, "bgp mode enable, calico..")
 	initCmd.Flags().StringVar(&install.MTU, "mtu", "1440", "mtu of the ipip mode , calico..")
 	initCmd.Flags().StringVar(&install.LvscareImage.Image, "lvscare-image", "fanux/lvscare", "lvscare image name")
 	initCmd.Flags().StringVar(&install.LvscareImage.Tag, "lvscare-tag", "latest", "lvscare image tag name")

install/init.go

@@ -192,11 +192,10 @@ func (s *SealosInstaller) InstallMaster0() {
 		Interface = "interface=" + Interface
 	}
 
-
 	var cniVersion string
 	if SSHConfig.IsFileExist(s.Masters[0], "/root/kube/Metadata") {
 		var metajson string
-		var tmpdata metadata 
+		var tmpdata metadata
 		metajson = SSHConfig.CmdToString(s.Masters[0], "cat /root/kube/Metadata", "")
 		err := json.Unmarshal([]byte(metajson), &tmpdata)
 		if err != nil {
@@ -206,16 +205,15 @@ func (s *SealosInstaller) InstallMaster0() {
 			Network = tmpdata.CniName
 		}
 	}
-
 
 	netyaml := net.NewNetwork(Network, net.MetaData{
 		Interface:      Interface,
 		CIDR:           PodCIDR,
-		IPIP:           IPIP,
+		IPIP:           !BGP,
 		MTU:            MTU,
 		CniRepo:        Repo,
 		K8sServiceHost: s.ApiServer,
-		Version: cniVersion,
+		Version:        cniVersion,
 	}).Manifests("")
 
 	cmd = fmt.Sprintf(`echo '%s' | kubectl apply -f -`, netyaml)

install/vars.go

@@ -54,7 +54,7 @@ var (
 	//network interface name, like "eth.*|en.*"
 	Interface string
 	// the ipip mode of the calico
-	IPIP bool
+	BGP bool
 	// mtu size
 	MTU string