From c505de1dcd59ae8a1d5aa0f87bf153463bb313e4 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 11 Dec 2021 17:49:24 -0800 Subject: [PATCH] Remove support for Weave as of k8s 1.23 --- docs/networking.md | 2 +- docs/networking/weave.md | 2 ++ docs/releases/1.23-NOTES.md | 2 ++ pkg/apis/kops/validation/validation.go | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/networking.md b/docs/networking.md index f062c4d2fc..cd2cf483ae 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -25,7 +25,7 @@ The following table provides the support status for various networking providers | Kubenet | 1.5 | 1.5 | - | - | | Lyft VPC | 1.11 | - | 1.22 | 1.23 | | Romana | 1.8 | - | 1.18 | 1.19 | -| Weave | 1.5 | - | - | - | +| Weave | 1.5 | - | 1.23 | Kubernetes 1.23 | ### Which networking provider should you use? diff --git a/docs/networking/weave.md b/docs/networking/weave.md index 2c49d4e759..6c831559c9 100644 --- a/docs/networking/weave.md +++ b/docs/networking/weave.md @@ -1,5 +1,7 @@ ### Weave +⚠ The Weave CNI is not supported for Kubernetes 1.23 or later. + #### Installation To use the Weave, specify the following in the cluster spec. diff --git a/docs/releases/1.23-NOTES.md b/docs/releases/1.23-NOTES.md index 4640416dd1..c65bdb1e15 100644 --- a/docs/releases/1.23-NOTES.md +++ b/docs/releases/1.23-NOTES.md @@ -17,6 +17,8 @@ being used, then Kubernetes Node resources will be named after their AWS instanc * Support for the Lyft CNI has been removed. +* The Weave CNI is not supported for Kubernetes 1.23 or later. + * Support for CentOS 7 has been removed. * Support for CentOS 8 has been removed. diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 1e0e9ac7a6..980d5511ce 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -708,7 +708,9 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath * } optionTaken = true - if cluster.Spec.IsIPv6Only() { + if cluster.IsKubernetesGTE("1.23") { + allErrs = append(allErrs, field.Forbidden(fldPath.Child("weave"), "Weave is not supported for Kubernetes >= 1.23")) + } else if cluster.Spec.IsIPv6Only() { allErrs = append(allErrs, field.Forbidden(fldPath.Child("weave"), "Weave does not support IPv6")) } }