Skip to content

✨ Secondary cidr support for EKS workload clusters #2086

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jan 15, 2021
Merged

✨ Secondary cidr support for EKS workload clusters #2086

merged 3 commits into from
Jan 15, 2021

Conversation

MarcusNoble
Copy link
Contributor

@MarcusNoble MarcusNoble commented Nov 2, 2020 •
edited
Loading

What this PR does / why we need it:
Add support for creating subnets from a secondary CIDR range to be used with aws-node CNI for pod IPs.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2065

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 2, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @MarcusNoble. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 2, 2020
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 3, 2020
@richardcase
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 5, 2020
@MarcusNoble MarcusNoble marked this pull request as ready for review November 10, 2020 10:00
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 10, 2020
michaelbeaumont
michaelbeaumont reviewed Nov 10, 2020
View reviewed changes
michaelbeaumont
michaelbeaumont reviewed Nov 12, 2020
View reviewed changes
pkg/cloud/services/awsnode/cni.go Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a CAPI way to mark workload cluster resources as owned by some management cluster?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nothing that I've been able to find.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@randomvariable do you have any input on this at all? It's the only outstanding thing.

@randomvariable
Copy link
Member

I guess given that e2e tests are done, this is unblocked for potential merging?

@MarcusNoble
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Member

With the fix from #2199, the eks e2e should now run after a rebase.

@MarcusNoble
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-eks

1 similar comment
@MarcusNoble
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-eks

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 14, 2021
@richardcase
Copy link
Member

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Member

Hopefully after a rebase the e2e tests will run.

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 15, 2021
@MarcusNoble
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-eks

@MarcusNoble
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Member

e2e tests passing

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2021
@randomvariable
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: randomvariable

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 Jan 15, 2021
@k8s-ci-robot k8s-ci-robot merged commit d23cc4e into kubernetes-sigs:master Jan 15, 2021
@MarcusNoble MarcusNoble deleted the secondary_cidr branch January 15, 2021 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chuckha chuckha Awaiting requested review from chuckha

@randomvariable randomvariable Awaiting requested review from randomvariable

1 more reviewer

@michaelbeaumont michaelbeaumont michaelbeaumont left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@richardcase richardcase

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[EKS] Support secondary CIDR

5 participants

@MarcusNoble @k8s-ci-robot @richardcase @randomvariable @michaelbeaumont