Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement MultiClusterCIDR feature in flannel #1658

Merged

Conversation

thomasferrandiz
Copy link
Contributor

@thomasferrandiz thomasferrandiz commented Oct 7, 2022

Description

This PR implements the MultiClusterCIDR feature as requested in #1564.

It was tested manually with Kubernetes 1.26-alpha.1.

At the moment, it is optional and is activated via a flag when starting flannel.

Todos

  • [ X ] Tests
  • [ X] Documentation
  • Release note

Release Note

None required

@thomasferrandiz thomasferrandiz force-pushed the useClusterCIDRConfig branch 2 times, most recently from 8595efa to e425a3d Compare November 9, 2022 15:49
@thomasferrandiz thomasferrandiz marked this pull request as ready for review November 9, 2022 16:27
@thomasferrandiz thomasferrandiz changed the title Use cluster cidr config Implement MultiClusterCIDR feature in flannel Nov 10, 2022
Copy link
Collaborator

@manuelbuil manuelbuil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are so many changes to understand in once all the changes :)

Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/kube-flannel.yml Outdated Show resolved Hide resolved
Documentation/kube-flannel.yml Outdated Show resolved Hide resolved
subnet/kube/kube.go Outdated Show resolved Hide resolved
main.go Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Show resolved Hide resolved
subnet/kube/cluster_cidr.go Outdated Show resolved Hide resolved
subnet/kube/cluster_cidr.go Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Show resolved Hide resolved
main.go Outdated Show resolved Hide resolved
main.go Outdated Show resolved Hide resolved
subnet/config.go Show resolved Hide resolved
subnet/config.go Outdated Show resolved Hide resolved
subnet/config.go Show resolved Hide resolved
subnet/config.go Outdated Show resolved Hide resolved
subnet/config.go Show resolved Hide resolved
subnet/kube/cluster_cidr.go Outdated Show resolved Hide resolved
subnet/kube/cluster_cidr.go Show resolved Hide resolved
subnet/kube/cluster_cidr.go Outdated Show resolved Hide resolved
subnet/kube/kube.go Show resolved Hide resolved
subnet/kube/kube.go Show resolved Hide resolved
main.go Outdated Show resolved Hide resolved
@thomasferrandiz thomasferrandiz force-pushed the useClusterCIDRConfig branch 4 times, most recently from 1c92fa1 to 009178b Compare December 5, 2022 15:11
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/MultiClusterCIDR/README.md Outdated Show resolved Hide resolved
Documentation/kube-flannel-psp.yml Outdated Show resolved Hide resolved
Documentation/kube-flannel.yml Outdated Show resolved Hide resolved
backend/wireguard/device.go Outdated Show resolved Hide resolved
subnet/config.go Show resolved Hide resolved
subnet/kube/cluster_cidr.go Outdated Show resolved Hide resolved
subnet/kube/kube.go Show resolved Hide resolved
@thomasferrandiz thomasferrandiz force-pushed the useClusterCIDRConfig branch 3 times, most recently from a3c0029 to f72e7fd Compare December 12, 2022 09:02
This API requires Kubernetes 1.26 and is available for vxlan,
wireguard and host-gw backends.

Signed-off-by: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
Copy link
Collaborator

@manuelbuil manuelbuil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Thomas!

@thomasferrandiz thomasferrandiz merged commit 025e7a0 into flannel-io:master Dec 13, 2022
@thomasferrandiz thomasferrandiz deleted the useClusterCIDRConfig branch March 18, 2024 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants