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

🐛 Fix support for dual-stack network ranges #3172

Merged
merged 1 commit into from
Jun 11, 2020

Conversation

benmoss
Copy link

@benmoss benmoss commented Jun 9, 2020

What this PR does / why we need it:
Fixes support for dual-stack network ranges. Users can provide more than one pod and/or service CIDR block on their ClusterSpec's ClusterNetwork struct which then is used to populate the KubeadmConfig Networking struct.

Which issue(s) this PR fixes
Fixes #3149

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 9, 2020
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 9, 2020
@benmoss benmoss force-pushed the kubeadm-dual-stack branch 2 times, most recently from 12ff5cb to 3ab0163 Compare June 9, 2020 21:12
@benmoss benmoss force-pushed the kubeadm-dual-stack branch from 3ab0163 to f708cc8 Compare June 9, 2020 21:25
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 9, 2020
@benmoss
Copy link
Author

benmoss commented Jun 9, 2020

cc @sethp-nr since you just worked on this part of the codebase

@fabriziopandini
Copy link
Member

lgtm pending running make manifests to fix CI errors

@benmoss
Copy link
Author

benmoss commented Jun 10, 2020

I looked at doing validation using the function that Kubeadm uses but 1) we'd have to copy/pasta it, and 2) it's a lot harder for us to get all the information needed in one place. It'd have to end up being a reconciliation failure as far as I can think of, rather than a CRD validation.

@benmoss benmoss force-pushed the kubeadm-dual-stack branch from f708cc8 to 7638263 Compare June 10, 2020 13:31
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 10, 2020
@fabriziopandini
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2020
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/milestone v0.3.7

@k8s-ci-robot k8s-ci-robot added this to the v0.3.7 milestone Jun 11, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benmoss, vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2020
@k8s-ci-robot k8s-ci-robot merged commit 0580e91 into kubernetes-sigs:master Jun 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cluster API fails to propagate network setting into the KubeadmConfig
5 participants