kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17259 from hakman/flannel-0.26.2 

Remove removal notice for flannel and update docs
This commit is contained in:
Kubernetes Prow Robot 2025-02-09 07:09:56 -08:00 committed by GitHub
parent e77300b38c 4004966569
commit 100a3448aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/networking.md
View File

@ -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 | | Canal | 1.12 | - | 1.27 | Kubernetes 1.28 |
| Cilium | 1.9 | 1.15 | - | - | | Cilium | 1.9 | 1.15 | - | - |
| Cilium ENI | 1.18 | 1.26 | - | - | | Cilium ENI | 1.18 | 1.26 | - | - |
| Flannel udp | 1.5.2 | - | 1.27 | Kubernetes 1.28 | | Flannel udp | 1.5.2 | - | - | - |
| Flannel vxlan | 1.8.0 | - | 1.27 | Kubernetes 1.28 | | Flannel vxlan | 1.8.0 | - | - | - |
| Kindnet | 1.32 | - | - | - | | Kindnet | 1.32 | - | - | - |
| Kopeio | 1.5 | - | - | - | | Kopeio | 1.5 | - | - | - |
| Kube-router | 1.6.2 | - | 1.27 | Kubernetes 1.28 | | Kube-router | 1.6.2 | - | - | - |
| Kubenet | 1.5 | 1.5 | - | - | | Kubenet | 1.5 | 1.5 | - | - |
| Lyft VPC | 1.11 | - | 1.22 | 1.23 | | Lyft VPC | 1.11 | - | 1.22 | kOps 1.23 |
| Romana | 1.8 | - | 1.18 | 1.19 | | Romana | 1.8 | - | 1.18 | kOps 1.19 |
| Weave | 1.5 | - | 1.23 | Kubernetes 1.23 | | Weave | 1.5 | - | 1.23 | Kubernetes 1.23 |
### Specifying network option for cluster creation ### Specifying network option for cluster creation

2
docs/networking/flannel.md
View File

@ -1,7 +1,5 @@
# Flannel # Flannel
⚠ The Flannel CNI is not supported for Kubernetes 1.28 or later.
## Installing ## 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`. To install [flannel](https://github.com/coreos/flannel) - use `--networking flannel-vxlan` (recommended) or `--networking flannel-udp` (legacy). `--networking flannel` now selects `flannel-vxlan`.

2
docs/releases/1.32-NOTES.md
View File

@ -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. 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. 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 * TODO
## Some Feature ## Some Feature