Merge pull request #12010 from johngmyers/deprecate-lyft

Deprecate the Lyft CNI
kubernetes · Jul 18, 2021 · 7828e18 · 7828e18
2 parents d9b953e + 7ea2e67
commit 7828e18
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 40 deletions.
diff --git a/docs/networking.md b/docs/networking.md
@@ -23,7 +23,7 @@ The following table provides the support status for various networking providers
 | Kopeio | 1.5 | - | - | - |
 | Kube-router | 1.6.2 | - | - | - |
 | Kubenet | 1.5 | 1.5 | - | - |
-| Lyft VPC | 1.11 | - | - | - |
+| Lyft VPC | 1.11 | - | 1.22 | - |
 | Romana | 1.8 | - | 1.18 | 1.19 |
 | Weave | 1.5 | - | - | - |
 
@@ -77,7 +77,6 @@ Several CNI providers are currently built into kOps:
 * [Flannel](networking/flannel.md)
 * [Kube-router](networking/kube-router.md)
 * [Lyft VPC](networking/lyft-vpc.md)
-* [Romana](networking/romana.md)
 * [Weave](networking/weave.md)
 
 kOps makes it easy for cluster operators to choose one of these options. The manifests for the providers

diff --git a/docs/networking/lyft-vpc.md b/docs/networking/lyft-vpc.md
@@ -2,6 +2,8 @@
 
 The [lyft cni-ipvlan-vpc-k8s](https://github.com/lyft/cni-ipvlan-vpc-k8s) plugin uses Amazon Elastic Network Interfaces (ENI) to assign AWS-managed IPs to Pods using the Linux kernel's IPvlan driver in L2 mode.
 
+Support for the Lyft CNI is deprecated in kOps 1.22 and will be removed in kOps 1.23.
+
 ## Installing
 
 Read the [prerequisites](https://github.com/lyft/cni-ipvlan-vpc-k8s#prerequisites) before starting. In addition to that, you need to specify the VPC ID as `spec.networkID` in the cluster spec file.

diff --git a/docs/networking/romana.md b/docs/networking/romana.md
diff --git a/docs/releases/1.22-NOTES.md b/docs/releases/1.22-NOTES.md
@@ -64,6 +64,8 @@ spec:
 
 * Support for Kubernetes version 1.18 is deprecated and will be removed in kOps 1.24.
 
+* Support for the Lyft CNI is deprecated and will be removed in kOps 1.23.
+
 * Support for CentOS 7 is deprecated and will be removed in future versions of kOps.
 
 * Support for CentOS 8 is deprecated and will be removed in future versions of kOps.

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -106,7 +106,6 @@ nav:
       - Flannel: "networking/flannel.md"
       - Kube-Router: "networking/kube-router.md"
       - Lyft VPC: "networking/lyft-vpc.md"
-      - Romana: "networking/romana.md"
       - Weave: "networking/weave.md"
     - Run kOps in an existing VPC: "run_in_existing_vpc.md"
     - Supported network topologies: "topology.md"