Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ As of kOps 1.26 the default network provider is Cilium. Prior to that the defaul
| Canal | 1.12 | - | 1.27 | Kubernetes 1.28 |
| Cilium | 1.9 | 1.15 | - | - |
| Cilium ENI | 1.18 | 1.26 | - | - |
| Flannel udp | 1.5.2 | - | 1.27 | Kubernetes 1.28 |
| Flannel vxlan | 1.8.0 | - | 1.27 | Kubernetes 1.28 |
| Flannel udp | 1.5.2 | - | - | - |
| Flannel vxlan | 1.8.0 | - | - | - |
| Kindnet | 1.32 | - | - | - |
| Kopeio | 1.5 | - | - | - |
| Kube-router | 1.6.2 | - | 1.27 | Kubernetes 1.28 |
| Kube-router | 1.6.2 | - | - | - |
| Kubenet | 1.5 | 1.5 | - | - |
| Lyft VPC | 1.11 | - | 1.22 | 1.23 |
| Romana | 1.8 | - | 1.18 | 1.19 |
| Lyft VPC | 1.11 | - | 1.22 | kOps 1.23 |
| Romana | 1.8 | - | 1.18 | kOps 1.19 |
| Weave | 1.5 | - | 1.23 | Kubernetes 1.23 |

### Specifying network option for cluster creation
Expand Down
2 changes: 0 additions & 2 deletions docs/networking/flannel.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Flannel

⚠ The Flannel CNI is not supported for Kubernetes 1.28 or later.

## Installing

To install [flannel](https://github.com/coreos/flannel) - use `--networking flannel-vxlan` (recommended) or `--networking flannel-udp` (legacy). `--networking flannel` now selects `flannel-vxlan`.
Expand Down
2 changes: 2 additions & 0 deletions docs/releases/1.32-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ nodes that were added by an autoscaler during a rolling-update would not always
We recommend trying the new kops reconcile command, see [docs/tutorial/upgrading-kubernetes.md](https://github.com/kubernetes/kops/blob/master/docs/tutorial/upgrading-kubernetes.md) for more details.
The `kops reconcile` functionality was introduced in kOps 1.32.

* flannel is no longer planned to be removed and has been updated to v0.26.4.

* TODO

## Some Feature
Expand Down
Loading