diff --git a/docs/networking.md b/docs/networking.md index fb3fa8e7b6..ec76820a8c 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -1,4 +1,24 @@ -## 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 | 1.9 | - | - | - | +| Calico | 1.6 | 1.11 | - | - | +| Canal | 1.12 | - | - | - | +| Cilium | 1.9 | 1.15 | - | - | +| Flannel udp | 1.5.2 | - | - | - | +| Flannel vxlan | 1.8.0 | - | - | - | +| Kopeio | 1.5 | - | - | - | +| Kube-router | 1.6.2 | - | - | - | +| Kubenet | 1.5 | 1.5 | - | - | +| Lyft VPC | 1.11 | - | - | - | +| Romana | 1.8 | - | 1.18 | 1.19 | +| Weave | 1.5 | - | - | - | + The networking options determines how the pod and service networking is implemented and managed. 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 diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 33d34d3762..2c201d9628 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -3218,7 +3218,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 52e506d47b..0ec2e2c299 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -193,6 +193,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 fe9761f336..66403469bf 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -193,6 +193,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"`