Skip to content

MultiClusterCIDR for v1.26#6885

Merged
rbrtbnfgl merged 3 commits into
k3s-io:masterfrom
rbrtbnfgl:multi-cluster-cidr
Mar 14, 2023
Merged

MultiClusterCIDR for v1.26#6885
rbrtbnfgl merged 3 commits into
k3s-io:masterfrom
rbrtbnfgl:multi-cluster-cidr

Conversation

@rbrtbnfgl

@rbrtbnfgl rbrtbnfgl commented Feb 6, 2023

Copy link
Copy Markdown
Contributor

Proposed Changes

Types of Changes

New Feature

Verification

Testing

To start a K3s cluster with multi cluster CIDR enabled use the flag --multi-cluster-cidr and the clustercidrs should be visible through the API and kubectl to configure a new cluster CIDR follow flannel documentation https://github.com/flannel-io/flannel/tree/master/Documentation/MultiClusterCIDR#configure-the-required-clustercidr-resources

DualStack setup could have issues related to the different address spaces between IPv4 and IPv6 that should be the same.

Linked Issues

#6443

User-Facing Change

MultiClusterCIDR feature

Further Comments

@rbrtbnfgl rbrtbnfgl requested a review from a team as a code owner February 6, 2023 17:25
@rbrtbnfgl rbrtbnfgl force-pushed the multi-cluster-cidr branch 2 times, most recently from 2dc00e8 to 55d0f93 Compare February 6, 2023 18:18

@dereknola dereknola left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is it possible to consolidate the 2 E2E tests you wrote into a single IPv4 + IPv6 test?

Comment thread pkg/cli/cmds/server.go Outdated
Comment thread pkg/cli/cmds/server.go Outdated
Comment thread pkg/cli/cmds/server.go
@brandond

brandond commented Feb 7, 2023

Copy link
Copy Markdown
Member

How does this behave if the user enables it but does not create a ClusterCIDR resource? Is a default one created from the legacy cluster/service cidr args?

@rbrtbnfgl

Copy link
Copy Markdown
Contributor Author

How does this behave if the user enables it but does not create a ClusterCIDR resource? Is a default one created from the legacy cluster/service cidr args?

When the flag is enabled a first ClusterCIDR resource is created based on the --cluster-cidr defined and the Kube-controller will always use it to allocate the CIDRs for each node.

@rbrtbnfgl rbrtbnfgl changed the title Update flannel to v0.21.0 and MultiClusterCIDR for v1.26 Update flannel to v0.21.1 and MultiClusterCIDR for v1.26 Feb 8, 2023
@rbrtbnfgl rbrtbnfgl force-pushed the multi-cluster-cidr branch 3 times, most recently from 1c996ab to 7b903fd Compare February 9, 2023 13:28
@rbrtbnfgl

Copy link
Copy Markdown
Contributor Author

@brandond Do we want to keep this on hold and merge only the flannel version update for the next release?

@brandond

Copy link
Copy Markdown
Member

@rbrtbnfgl yeah lets just do the flannel version bump for now, I think the multi-ClusterCIDR stuff is probably worth at least a talk through in design review.

@rbrtbnfgl rbrtbnfgl changed the title Update flannel to v0.21.1 and MultiClusterCIDR for v1.26 [WIP] MultiClusterCIDR for v1.26 Feb 10, 2023
Comment thread pkg/daemons/control/server.go Outdated
Comment thread pkg/daemons/control/server.go Outdated
@rbrtbnfgl rbrtbnfgl force-pushed the multi-cluster-cidr branch 2 times, most recently from 0e9640d to 2f327e7 Compare February 14, 2023 11:59
Comment thread pkg/daemons/config/types.go Outdated
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
@dereknola dereknola changed the title [WIP] MultiClusterCIDR for v1.26 MultiClusterCIDR for v1.26 Mar 13, 2023
@rbrtbnfgl rbrtbnfgl merged commit 7d2f997 into k3s-io:master Mar 14, 2023
@rbrtbnfgl rbrtbnfgl deleted the multi-cluster-cidr branch March 14, 2023 17:30
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.

4 participants