Update calico to v3.26.1

Signed-off-by: pixiake <guofeng@yunify.com>
(cherry picked from commit 150836f)

cmd/kk/apis/kubekey/v1alpha2/default.go

@@ -46,7 +46,7 @@ const (
 	DefaultRuncVersion             = "v1.1.1"
 	DefaultCrictlVersion           = "v1.24.0"
 	DefaultKubeVersion             = "v1.23.10"
-	DefaultCalicoVersion           = "v3.23.2"
+	DefaultCalicoVersion           = "v3.26.1"
 	DefaultFlannelVersion          = "v0.21.3"
 	DefaultFlannelCniPluginVersion = "v1.1.2"
 	DefaultCniVersion              = "v1.2.0"

cmd/kk/apis/kubekey/v1alpha2/network_types.go

@@ -31,6 +31,7 @@ type CalicoCfg struct {
 	VXLANMode       string `yaml:"vxlanMode" json:"vxlanMode,omitempty"`
 	VethMTU         int    `yaml:"vethMTU" json:"vethMTU,omitempty"`
 	Ipv4NatOutgoing *bool  `yaml:"ipv4NatOutgoing" json:"ipv4NatOutgoing,omitempty"`
+	DefaultIPPOOL   *bool  `yaml:"defaultIPPOOL" json:"defaultIPPOOL,omitempty"`
 }
 
 type FlannelCfg struct {
@@ -138,7 +139,15 @@ func (n *NetworkConfig) EnableMultusCNI() bool {
 // EnableIPV4POOL_NAT_OUTGOING is used to determine whether to enable CALICO_IPV4POOL_NAT_OUTGOING.
 func (c *CalicoCfg) EnableIPV4POOL_NAT_OUTGOING() bool {
 	if c.Ipv4NatOutgoing == nil {
-		return true
+		return false
 	}
 	return *c.Ipv4NatOutgoing
 }
+
+// EnableDefaultIPPOOL is used to determine whether to create default ippool
+func (c *CalicoCfg) EnableDefaultIPPOOL() bool {
+	if c.DefaultIPPOOL == nil {
+		return true
+	}
+	return *c.DefaultIPPOOL
+}

cmd/kk/pkg/plugins/network/modules.go

@@ -142,6 +142,7 @@ func deployCalico(d *DeployNetworkPluginModule) []task.Interface {
 				"VXLANMode":               d.KubeConf.Cluster.Network.Calico.VXLANMode,
 				"ConatinerManagerIsIsula": d.KubeConf.Cluster.Kubernetes.ContainerManager == "isula",
 				"IPV4POOLNATOUTGOING":     d.KubeConf.Cluster.Network.Calico.EnableIPV4POOL_NAT_OUTGOING(),
+				"DefaultIPPOOL":           d.KubeConf.Cluster.Network.Calico.EnableDefaultIPPOOL(),
 			},
 		},
 		Parallel: true,