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

Provide dual-stack support to canal #209

Merged
merged 1 commit into from
Jan 14, 2022

Conversation

manuelbuil
Copy link
Contributor

@manuelbuil manuelbuil commented Jan 14, 2022

Update the calico image to v3.20.3-build20220114, which supports dual-stack.

Change the config.yaml so that the ipv6 config only applies when clustercidr contains ipv6

Issue: rancher/rke2#2342

Signed-off-by: Manuel Buil [email protected]

@manuelbuil
Copy link
Contributor Author

Tested and dualStack seems to work

Copy link

@rosskirkpat rosskirkpat left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

@vadorovsky vadorovsky left a comment

Choose a reason for hiding this comment

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

One nit

@@ -36,7 +36,20 @@ data:
"mtu": __CNI_MTU__,
"ipam": {
"type": "host-local",
"subnet": "usePodCidr"
"ranges": [
[
Copy link
Contributor

Choose a reason for hiding this comment

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

You have 4 spaces as an indentation everywhere else, please stick to that.

@manuelbuil manuelbuil merged commit 9ed8d73 into rancher:main-source Jan 14, 2022
@manuelbuil manuelbuil deleted the canal-dualStack branch January 14, 2022 17:39
github-actions bot pushed a commit that referenced this pull request Jan 14, 2022
Provide dual-stack support to canal
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