feat(k3s): update k3s

update k3s

Signed-off-by: ysicing <i@ysicing.me>

Author: ysicing

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 - v3.3.0
   - [x] 支持kube resources
-  - [ ] 支持重建svc
+  - [x] 优化k3s安装,支持配置podcidr,svccidr
 
 - v3.2.0
   - [x] 支持批量执行shell

cmd/kube/k3s.go

@@ -28,14 +28,18 @@ func K3sCmd(f factory.Factory) *cobra.Command {
 		Use:     "init",
 		Short:   "init k3s control-plane(master) node",
 		Long:    `example: ergo k3s init --docker`,
-		Version: "2.6.0",
+		Version: "3.3.0",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return opt.Init()
 		},
 	}
 	k3s.AddCommand(init)
 	init.PersistentFlags().StringVar(&opt.KsSan, "san", "ysicing.local", "Add additional hostname or IP as a Subject Alternative Name in the TLS cert")
 	init.PersistentFlags().BoolVar(&opt.CniNo, "nocni", true, "If true, Use cni none")
+	init.PersistentFlags().StringVar(&opt.PodCIDR, "pod-cidr", "10.42.0.0/16", "IPv4/IPv6 network CIDRs to use for pod IPs")
+	init.PersistentFlags().StringVar(&opt.SvcCIDR, "svc-cidr", "10.43.0.0/16", "IPv4/IPv6 network CIDRs to use for service IPs")
+	init.PersistentFlags().StringVar(&opt.DnSSvcIP, "dns-svcip", "10.43.0.10", " IPv4 Cluster IP for coredns service. Should be in your service-cidr range")
+
 	join := &cobra.Command{
 		Use:     "join",
 		Short:   "join k3s cluster",
@@ -65,15 +69,5 @@ func K3sCmd(f factory.Factory) *cobra.Command {
 		},
 	}
 	k3s.AddCommand(getbin)
-	rebuildService := &cobra.Command{
-		Use:     "rebuild-svc",
-		Short:   "rebuild k3s service",
-		Version: "3.3.0",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			_, err := opt.PreCheckK3sBin()
-			return err
-		},
-	}
-	k3s.AddCommand(rebuildService)
 	return k3s
 }

pkg/k3s/k3s.go

@@ -25,6 +25,10 @@ type Option struct {
 	CniNo      bool   `json:"cniNo"`
 	KsSan      string `json:"ksSan"`
 	EIP        string `json:"eip"`
+	PodCIDR    string `json:"podCIDR"`
+	SvcCIDR    string `json:"svcCIDR"`
+	DnSSvcIP   string `json:"dnsSvcIP"`
+
 	// Join
 	KsAddr  string `json:"ksAddr"`
 	KsToken string `json:"ksToken"`
@@ -66,6 +70,7 @@ func (o *Option) Init() error {
 	}
 	k3sargs := []string{
 		"server",
+		"--tls-san=kapi.k3s.local",
 		"--disable=servicelb,traefik",
 		"--disable-helm-controller",
 		"--kube-proxy-arg=proxy-mode=ipvs",
@@ -153,7 +158,7 @@ func (o *Option) Init() error {
 		kubectlbin = common.KubectlBinPath
 	}
 	if o.CniNo {
-		o.Klog.Warnf("Cilium is recommended: cilium install --ipv4-native-routing-cidr 10.42.0.0/16 --config cluster-pool-ipv4-cidr=10.42.0.0/16")
+		o.Klog.Warnf("Cilium is recommended: cilium install --ipv4-native-routing-cidr %s --config cluster-pool-ipv4-cidr=%s", o.PodCIDR, o.PodCIDR)
 	}
 	getnodesoutput, err := exec.Command(kubectlbin, "get", "nodes").CombinedOutput()
 	if err != nil {
@@ -248,6 +253,9 @@ func (o *Option) configArgs() []string {
 		if len(o.KsSan) != 0 {
 			args = append(args, fmt.Sprintf("--tls-san=%v", o.KsSan))
 		}
+		args = append(args, fmt.Sprintf("--cluster-cidr=%v", o.PodCIDR))
+		args = append(args, fmt.Sprintf("--service-cidr=%v", o.SvcCIDR))
+		args = append(args, fmt.Sprintf("--cluster-dns=%v", o.DnSSvcIP))
 	}
 
 	if len(o.EIP) != 0 {