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

Bump Cilium to v1.14.2

This commit is contained in:
zadjadr 2023-08-08 12:42:27 +02:00
parent 419b93b9e9
commit 4dfaba5242
No known key found for this signature in database
GPG Key ID: 0F5C56E6213A7610
5 changed files with 625 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1244,8 +1244,8 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Could not parse as semantic version"))
}
if version.Minor != 13 {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.13 is supported"))
if version.Minor != 14 {
allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only version 1.14 is supported"))
}
if v.Hubble != nil && fi.ValueOf(v.Hubble.Enabled) {
@ -1293,15 +1293,6 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
}
allErrs = append(allErrs, IsValidValue(fldPath.Child("encryptionType"), &v.EncryptionType, []kops.CiliumEncryptionType{kops.CiliumEncryptionTypeIPSec, kops.CiliumEncryptionTypeWireguard})...)
if v.EncryptionType == "wireguard" {
// Cilium with Wireguard integration follow-up --> https://github.com/cilium/cilium/issues/15462.
// The following rule of validation should be deleted as this combination
// will be supported on future releases of Cilium (>= v1.11.0).
if fi.ValueOf(v.EnableL7Proxy) {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("enableL7Proxy"), "L7 proxy cannot be enabled if wireguard is enabled."))
}
}
}
if fi.ValueOf(v.EnableL7Proxy) && v.InstallIptablesRules != nil && !*v.InstallIptablesRules {

6
pkg/apis/kops/validation/validation_test.go
View File

@ -963,7 +963,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Version: "v1.13.5",
Version: "v1.14.2",
Ingress: &kops.CiliumIngressSpec{
Enabled: fi.PtrTo(true),
DefaultLoadBalancerMode: "bad-value",
@ -973,7 +973,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Version: "v1.13.5",
Version: "v1.14.2",
Ingress: &kops.CiliumIngressSpec{
Enabled: fi.PtrTo(true),
DefaultLoadBalancerMode: "dedicated",
@ -982,7 +982,7 @@ func Test_Validate_Cilium(t *testing.T) {
},
{
Cilium: kops.CiliumNetworkingSpec{
Version: "v1.13.5",
Version: "v1.14.2",
Hubble: &kops.HubbleSpec{
Enabled: fi.PtrTo(true),
},

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

@ -40,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
}
if c.Version == "" {
c.Version = "v1.13.5"
c.Version = "v1.14.2"
}
if c.EnableEndpointHealthChecking == nil {

797
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.13.yaml.template → upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.14.yaml.template
View File

File diff suppressed because it is too large Load Diff

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

@ -35,7 +35,7 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *AddonList) error {
klog.Infof("found cilium (%q) in addons; won't use builtin", key)
} else {
id := "k8s-1.16"
location := key + "/" + id + "-v1.13.yaml"
location := key + "/" + id + "-v1.14.yaml"
addon := &api.AddonSpec{
Name: fi.PtrTo(key),