15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1961 from pixiake/master 

Update calico to v3.26.1
This commit is contained in:
KubeSphere CI Bot 2023-08-23 11:01:00 +08:00 committed by GitHub
parent 8b11847712 150836f228
commit 4878e8d391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 604 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kk/apis/kubekey/v1alpha2/default.go
View File

@ -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"

11
cmd/kk/apis/kubekey/v1alpha2/network_types.go
View File

@ -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
}

1
cmd/kk/pkg/plugins/network/modules.go
View File

@ -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,

808
cmd/kk/pkg/plugins/network/templates/calico_v1.16+.go
View File

File diff suppressed because it is too large Load Diff

10
hack/sync-components.sh
View File

@ -304,11 +304,11 @@ fi
# Sync Calico Images
if [ $CALICO_VERSION ]; then
skopeo sync --src docker --dest docker docker.io/calico/calico-kube-controllers:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/calico-kube-controllers:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/calico-cni:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/calico-cni:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/calico-node:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/calico-node:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/calico-flexvol:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/calico-flexvol:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/calico-typha:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/calico-typha:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/kube-controllers:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/kube-controllers:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/cni:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/cni:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/node:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/node:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/pod2daemon-flexvol:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/pod2daemon-flexvol:$CALICO_VERSION --all
skopeo sync --src docker --dest docker docker.io/calico/typha:$CALICO_VERSION registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/typha:$CALICO_VERSION --all
fi
# Sync Kube-OVN Images

6
version/components.json
View File

@ -1034,10 +1034,12 @@
},
"calicoctl": {
"amd64": {
"v3.23.2": "3784200cdfc0106c9987df2048d219bb91147f0cc3fa365b36279ac82ea37c7a"
"v3.23.2": "3784200cdfc0106c9987df2048d219bb91147f0cc3fa365b36279ac82ea37c7a",
"v3.26.1": "c8f61c1c8e2504410adaff4a7255c65785fe7805eebfd63340ccd3c472aa42cf"
},
"arm64": {
"v3.23.2": "232b992e6767c68c8c832cc7027a0d9aacb29901a9b5e8871e25baedbbb9c64c"
"v3.23.2": "232b992e6767c68c8c832cc7027a0d9aacb29901a9b5e8871e25baedbbb9c64c",
"v3.26.1": "bba2fbdd6d2998bca144ae12c2675d65c4fbf51c0944d69b1b2f20e08cd14c22"
}
}
}