From 8e2e60ae44fade0f72b9a5eca1fbaab3427e1a29 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Fri, 12 Mar 2021 14:15:42 +0100 Subject: [PATCH] Allow cilium 1.10 --- pkg/apis/kops/validation/validation.go | 4 ++-- upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index e5162d0f06..efc685bfde 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -702,8 +702,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 >= 6 && version.Minor <= 9) { - allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.6 through 1.9 are supported")) + if !(version.Minor >= 6 && version.Minor <= 10) { + allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.6 through 1.10 are supported")) } if version.Minor == 6 && cluster.IsKubernetesGTE("1.16") { diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go index f99ded551e..ec20ed2387 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go @@ -64,7 +64,7 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *api.Addons) error { NeedsRollingUpdate: "all", }) } - } else if ver.Minor == 9 { + } else if ver.Minor == 9 || ver.Minor == 10 { version := "1.9.0-kops.1" { id := "k8s-1.12"