From 0d946b15c1e24bad510768e43b4631843aa9fd84 Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Mon, 22 Nov 2021 12:10:48 +0100
Subject: [PATCH] Allow setting cilium 1.11

Currently at rc2 and it doesn't look like any changes are needed to the
manifests.
---
 pkg/apis/kops/validation/validation.go                | 8 +++-----
 upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go | 5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go
index fb47c22049..173357a3b7 100644
--- a/pkg/apis/kops/validation/validation.go
+++ b/pkg/apis/kops/validation/validation.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/dns"
 	"k8s.io/kops/pkg/model/components"
@@ -168,7 +169,6 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie
 
 	if spec.MetricsServer != nil {
 		allErrs = append(allErrs, validateMetricsServer(c, spec.MetricsServer, fieldPath.Child("metricsServer"))...)
-
 	}
 
 	if spec.AWSLoadBalancerController != nil {
@@ -177,7 +177,6 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie
 
 	if spec.SnapshotController != nil {
 		allErrs = append(allErrs, validateSnapshotController(c, spec.SnapshotController, fieldPath.Child("snapshotController"))...)
-
 	}
 
 	// IAM additional policies
@@ -861,8 +860,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 >= 8 && version.Minor <= 10) {
-			allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.8 through 1.10 are supported"))
+		if !(version.Minor >= 8 && version.Minor <= 11) {
+			allErrs = append(allErrs, field.Invalid(versionFld, v.Version, "Only versions 1.8 through 1.11 are supported"))
 		}
 
 		if version.Minor < 10 && c.IsIPv6Only() {
@@ -1511,7 +1510,6 @@ func validateExternalDNS(cluster *kops.Cluster, spec *kops.ExternalDNSConfig, fl
 	}
 
 	return allErrs
-
 }
 
 func validateNodeTerminationHandler(cluster *kops.Cluster, spec *kops.NodeTerminationHandlerConfig, fldPath *field.Path) (allErrs field.ErrorList) {
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go
index 35cc3f26ae..ba4828bb2d 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/cilium.go
@@ -20,12 +20,12 @@ import (
 	"fmt"
 
 	"github.com/blang/semver/v4"
+
 	"k8s.io/kops/channels/pkg/api"
 	"k8s.io/kops/upup/pkg/fi"
 )
 
 func addCiliumAddon(b *BootstrapChannelBuilder, addons *AddonList) error {
-
 	cilium := b.Cluster.Spec.Networking.Cilium
 	if cilium != nil {
 		ver, err := semver.ParseTolerant(cilium.Version)
@@ -64,7 +64,7 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *AddonList) error {
 				}
 				addons.Add(addon)
 			}
-		} else if ver.Minor == 10 {
+		} else if ver.Minor == 10 || ver.Minor == 11 {
 			{
 				id := "k8s-1.16"
 				location := key + "/" + id + "-v1.10.yaml"
@@ -86,5 +86,4 @@ func addCiliumAddon(b *BootstrapChannelBuilder, addons *AddonList) error {
 		}
 	}
 	return nil
-
 }