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

Add more support for cilium 1.10

This commit is contained in:
Ole Markus With 2021-05-03 15:58:15 +02:00
parent b054fb37b7
commit aadcd9d448
5 changed files with 1089 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/validation/validation.go
View File

@ -789,6 +789,10 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
allErrs = append(allErrs, field.Forbidden(versionFld, "Version 1.7 requires kubernetesVersion before 1.17"))
}
if version.Minor == 10 && cluster.IsKubernetesLT("1.16") {
allErrs = append(allErrs, field.Forbidden(versionFld, "Version 1.10 requires kubernetesVersion 1.16 or newer"))
}
if v.Hubble != nil && fi.BoolValue(v.Hubble.Enabled) {
if !components.IsCertManagerEnabled(cluster) {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("hubble", "enabled"), "Hubble requires that cert manager is enabled"))

12
pkg/model/components/cilium.go
View File

@ -65,10 +65,6 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
c.SidecarIstioProxyImage = "cilium/istio_proxy"
}
if c.Tunnel == "" {
c.Tunnel = "vxlan"
}
if c.ToFqdnsDNSRejectResponseCode == "" {
c.ToFqdnsDNSRejectResponseCode = "refused"
}
@ -89,6 +85,14 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
}
}
if c.Tunnel == "" {
if c.Ipam == "eni" {
c.Tunnel = "disabled"
} else {
c.Tunnel = "vxlan"
}
}
if c.EnableRemoteNodeIdentity == nil {
c.EnableRemoteNodeIdentity = fi.Bool(true)
}

3
upup/models/BUILD.bazel generated
View File

@ -32,7 +32,6 @@ go_library(
"cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.12.yaml.template",
"cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.16.yaml.template",
"cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template",
"cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template",
"cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template",
"cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template",
"cloudup/resources/addons/networking.kope.io/k8s-1.12.yaml",
@ -55,6 +54,8 @@ go_library(
"cloudup/resources/addons/storage-aws.addons.k8s.io/v1.7.0.yaml.template",
"cloudup/resources/addons/storage-gce.addons.k8s.io/v1.7.0.yaml.template",
"cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template",
"cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template",
"cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template",
],
importpath = "k8s.io/kops/upup/models",
visibility = ["//visibility:public"],

1055
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -64,12 +64,31 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *api.Addons) error {
NeedsRollingUpdate: "all",
})
}
} else if ver.Minor == 9 || ver.Minor == 10 {
} else if ver.Minor == 9 {
version := "1.9.4-kops.1"
{
id := "k8s-1.12"
location := key + "/" + id + "-v1.9.yaml"
addon := &api.AddonSpec{
Name: fi.String(key),
Version: fi.String(version),
Selector: networkingSelector(),
Manifest: fi.String(location),
Id: id,
NeedsRollingUpdate: "all",
}
if cilium.Hubble != nil && fi.BoolValue(cilium.Hubble.Enabled) {
addon.NeedsPKI = true
}
addons.Spec.Addons = append(addons.Spec.Addons, addon)
}
} else if ver.Minor == 10 {
version := "1.10.0-kops.1"
{
id := "k8s-1.16"
location := key + "/" + id + "-v1.10.yaml"
addon := &api.AddonSpec{
Name: fi.String(key),
Version: fi.String(version),