From 37fab68972dfc204e9481aed8c8c96ff10d9ff34 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Mon, 18 May 2020 18:39:36 +0200 Subject: [PATCH 1/5] Add table of networking providers and their status --- docs/networking.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/networking.md b/docs/networking.md index fb3fa8e7b6..39e61f7fa6 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -1,4 +1,25 @@ -## Kubernetes Networking Options +# Kubernetes Networking Options + +## Supported networking options + +The following table provides the support status for various networking providers with regards to Kops version: + +| Network provider | Experimental | Stable | Deprecated | Removed | +| ------------ | -----------: | -----: | ---------: | ------: | +| AWS VPC | ? | ? | - | - | +| Calico | 1.6 | 1.11 | - | - | +| Canal | 1.12 | - | - | - | +| Cilium | 1.9 | 1.15 | - | - | +| Classic | ? | ? | 1.17 | 1.18 | +| Flannel udp | ? | - | - | - | +| Flannel vxlan | ? | - | - | - | +| Kopeio | ? | - | 1.17 | 1.18 | +| Kube-router | 1.6.2 | - | - | - | +| Kubenet | ? | ? | - | - | +| Lyft VPC | 1.11 | - | - | - | +| Romana | ? | - | 1.17 | 1.18 | +| Weave | ? | ? | - | - | + The networking options determines how the pod and service networking is implemented and managed. From da2ae8c08a9724fdf1bec60919e47821a1339915 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Tue, 19 May 2020 08:42:04 +0200 Subject: [PATCH 2/5] Add missing versions. Being a bit more conservative with what we mark stable --- docs/networking.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/networking.md b/docs/networking.md index 39e61f7fa6..bcb041b74e 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -6,19 +6,18 @@ The following table provides the support status for various networking providers | Network provider | Experimental | Stable | Deprecated | Removed | | ------------ | -----------: | -----: | ---------: | ------: | -| AWS VPC | ? | ? | - | - | +| AWS VPC | 1.9 | - | - | - | | Calico | 1.6 | 1.11 | - | - | | Canal | 1.12 | - | - | - | | Cilium | 1.9 | 1.15 | - | - | -| Classic | ? | ? | 1.17 | 1.18 | -| Flannel udp | ? | - | - | - | -| Flannel vxlan | ? | - | - | - | -| Kopeio | ? | - | 1.17 | 1.18 | +| Flannel udp | 1.5.2 | - | - | - | +| Flannel vxlan | 1.8.0 | - | - | - | +| Kopeio | 1.5 | - | 1.17 | 1.18 | | Kube-router | 1.6.2 | - | - | - | -| Kubenet | ? | ? | - | - | +| Kubenet | 1.5 | 1.5 | - | - | | Lyft VPC | 1.11 | - | - | - | -| Romana | ? | - | 1.17 | 1.18 | -| Weave | ? | ? | - | - | +| Romana | 1.8 | - | 1.17 | 1.18 | +| Weave | 1.5 | - | - | - | The networking options determines how the pod and service networking is implemented and managed. From 1aecb50d9f1a6528bab8e1811194f8c21514935a Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Wed, 3 Jun 2020 07:33:10 +0200 Subject: [PATCH 3/5] Keep kopeio experimental. Bump kops version for deprecation for Romana --- docs/networking.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/networking.md b/docs/networking.md index bcb041b74e..ec76820a8c 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -12,11 +12,11 @@ The following table provides the support status for various networking providers | Cilium | 1.9 | 1.15 | - | - | | Flannel udp | 1.5.2 | - | - | - | | Flannel vxlan | 1.8.0 | - | - | - | -| Kopeio | 1.5 | - | 1.17 | 1.18 | +| Kopeio | 1.5 | - | - | - | | Kube-router | 1.6.2 | - | - | - | | Kubenet | 1.5 | 1.5 | - | - | | Lyft VPC | 1.11 | - | - | - | -| Romana | 1.8 | - | 1.17 | 1.18 | +| Romana | 1.8 | - | 1.18 | 1.19 | | Weave | 1.5 | - | - | - | From 1f11ceeabe2755a9364532666bd99f1bde42b76f Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Wed, 3 Jun 2020 07:42:10 +0200 Subject: [PATCH 4/5] Add Romana deprecation/removal notices to docs/release notes --- docs/networking/romana.md | 2 ++ docs/releases/1.18-NOTES.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/networking/romana.md b/docs/networking/romana.md index eaabd7c65e..b3168d0795 100644 --- a/docs/networking/romana.md +++ b/docs/networking/romana.md @@ -1,5 +1,7 @@ # Romana +Support for Romana is deprecated as of kops 1.18 and removed in kops 1.19. + ## Installing To use Romana, specify the following in the cluster spec: diff --git a/docs/releases/1.18-NOTES.md b/docs/releases/1.18-NOTES.md index 7a1b820819..f4ad0efad9 100644 --- a/docs/releases/1.18-NOTES.md +++ b/docs/releases/1.18-NOTES.md @@ -113,6 +113,8 @@ * Support for Ubuntu 16.04 (Xenial) has been deprecated and will be removed in future versions of Kops. +* Support for the Romana networking provider is deprecated and will be removed in kops 1.19. + # Full change list since 1.17.0 release ## 1.17.0-alpha.1 to 1.18.0-alpha.1 From e994bb80a6c255edcca56c48b32d7b91e68ddb82 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Wed, 3 Jun 2020 08:11:43 +0200 Subject: [PATCH 5/5] Add Romana deprecation/removal notices to godoc --- k8s/crds/kops.k8s.io_clusters.yaml | 3 ++- pkg/apis/kops/networking.go | 1 + pkg/apis/kops/v1alpha2/networking.go | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index ba144e248e..1b23e11f9c 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -3202,7 +3202,8 @@ spec: type: object romana: description: RomanaNetworkingSpec declares that we want Romana - networking + networking Romana is deprecated as of kops 1.18 and removed + as of kops 1.19 properties: daemonServiceIP: description: DaemonServiceIP is the Kubernetes Service IP diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index 644feaba8f..4391259f77 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -181,6 +181,7 @@ type KuberouterNetworkingSpec struct { } // RomanaNetworkingSpec declares that we want Romana networking +// Romana is deprecated as of kops 1.18 and removed as of kops 1.19 type RomanaNetworkingSpec struct { // DaemonServiceIP is the Kubernetes Service IP for the romana-daemon pod DaemonServiceIP string `json:"daemonServiceIP,omitempty"` diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go index 84bac3c0a2..dbab3bb1bd 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -181,6 +181,7 @@ type KuberouterNetworkingSpec struct { } // RomanaNetworkingSpec declares that we want Romana networking +// Romana is deprecated as of kops 1.18 and removed as of kops 1.19 type RomanaNetworkingSpec struct { // DaemonServiceIP is the Kubernetes Service IP for the romana-daemon pod DaemonServiceIP string `json:"daemonServiceIP,omitempty"`