kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Calico to v3.24.1

This commit is contained in:
Ciprian Hacman 2022-09-03 09:24:55 +03:00
parent 9faeb5b8a9
commit 6a5ba584c5
2 changed files with 5034 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5017
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template Normal file
View File

File diff suppressed because it is too large Load Diff

21
upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
View File

@ -922,26 +922,39 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon
if b.Cluster.Spec.Networking.Calico != nil { if b.Cluster.Spec.Networking.Calico != nil {
key := "networking.projectcalico.org" key := "networking.projectcalico.org"
if b.IsKubernetesGTE("v1.22.0") { if b.IsKubernetesGTE("v1.25.0") {
id := "k8s-1.22" id := "k8s-1.25"
location := key + "/" + id + ".yaml" location := key + "/" + id + ".yaml"
addons.Add(&channelsapi.AddonSpec{ addon := addons.Add(&channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Selector: networkingSelector(), Selector: networkingSelector(),
Manifest: fi.String(location), Manifest: fi.String(location),
Id: id, Id: id,
}) })
addon.BuildPrune = true
} else if b.IsKubernetesGTE("v1.22.0") {
id := "k8s-1.22"
location := key + "/" + id + ".yaml"
addon := addons.Add(&channelsapi.AddonSpec{
Name: fi.String(key),
Selector: networkingSelector(),
Manifest: fi.String(location),
Id: id,
})
addon.BuildPrune = true
} else { } else {
id := "k8s-1.16" id := "k8s-1.16"
location := key + "/" + id + ".yaml" location := key + "/" + id + ".yaml"
addons.Add(&channelsapi.AddonSpec{ addon := addons.Add(&channelsapi.AddonSpec{
Name: fi.String(key), Name: fi.String(key),
Selector: networkingSelector(), Selector: networkingSelector(),
Manifest: fi.String(location), Manifest: fi.String(location),
Id: id, Id: id,
}) })
addon.BuildPrune = true
} }
} }