Skip to content

IPAM: Refactors Node API Types to Support Separate IP Families #30684

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 1 commit into from
Apr 1, 2024
Merged

IPAM: Refactors Node API Types to Support Separate IP Families #30684

merged 1 commit into from
Apr 1, 2024

Conversation

danehans
Copy link
Contributor

@danehans danehans commented Feb 8, 2024 •
edited
Loading

Previously, the IPAM Node type represented IP information such as pools, allocations, etc. that are specific to IPv4. This PR introduces the following changes:

  • Adds the IPAllocAttrs type to represent IP-specific allocation attributes.
  • Updates the Node type to expose separate attributes for IPv4 and IPv6.
  • Updates Node instantiation, methods, etc. for the Node type changes introduced in this PR.
  • Updates the internal resyncStats API to expose separate attributes for IPv4
    and IPv6 node statistics.
  • Updates the AllocationAction API to expose separate IP allocation attributes for IPv4
    and IPv6.
  • Updates cloud provider IPAM pkgs for API changes.

Note: This PR does not implement IPv6 Node attributes.

Supports: #19251

@danehans danehans requested a review from a team as a code owner February 8, 2024 21:19
@danehans danehans requested a review from tommyp1ckles February 8, 2024 21:19
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 8, 2024
@danehans
Copy link
Contributor Author

danehans commented Feb 8, 2024

/test

@danehans danehans mentioned this pull request Feb 13, 2024
Open
@danehans danehans force-pushed the issue_19251_ipam_api_refactor branch 2 times, most recently from 6efd000 to e733a51 Compare February 21, 2024 22:30
@danehans danehans requested review from a team as code owners February 21, 2024 22:30
@danehans danehans requested a review from aanm February 21, 2024 22:30
@danehans danehans force-pushed the issue_19251_ipam_api_refactor branch from e733a51 to 620b4a7 Compare February 21, 2024 22:44
@danehans danehans changed the title pkg/ipam: Refactors Node Type to Support IP Families IPAM: Refactors Node API Types to Support Separate IP Families Feb 21, 2024
@danehans danehans force-pushed the issue_19251_ipam_api_refactor branch from 620b4a7 to 0b266af Compare February 21, 2024 23:12
aanm
aanm approved these changes Feb 22, 2024
View reviewed changes
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

It's nice to see preparation / refactoring PRs outside of the implementation PR 💯

@aanm aanm added kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. labels Feb 22, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 22, 2024
@aanm
Copy link
Member

aanm commented Feb 22, 2024

/test

@aanm aanm enabled auto-merge February 22, 2024 09:50
@danehans danehans mentioned this pull request Feb 22, 2024
Closed
christarazi
christarazi reviewed Feb 26, 2024
View reviewed changes
Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

Thanks for the PR. A few comments:

  1. See below
  2. For the change to EmptyInterfaceSlots, I didn't see any justification for it in the commit msg, but from the context of the changes, I deduce that EmptyInterfaceSlots is not subject to IP family, so it has been moved out of the IP family-specific struct. Is that right? If so, please add that context to the commit msg.

@danehans
Copy link
Contributor Author

For the change to EmptyInterfaceSlots, I didn't see any justification for it in the commit msg, but from the context of the changes, I deduce that EmptyInterfaceSlots is not subject to IP family, so it has been moved out of the IP family-specific struct.

@christarazi you are correct, EmptyInterfaceSlots is not IP family specific, so it remains a Statistics field. I will update the commit message accordingly.

@danehans danehans force-pushed the issue_19251_ipam_api_refactor branch from 0b266af to a620529 Compare February 27, 2024 18:19
@christarazi christarazi added sig/ipam area/ipam IP address management, including cloud IPAM labels Feb 28, 2024
@danehans danehans force-pushed the issue_19251_ipam_api_refactor branch from a620529 to 27e061b Compare March 4, 2024 19:42
@danehans
Copy link
Contributor Author

/ci-ipsec-upgrade

@danehans
Copy link
Contributor Author

/ci-ipsec-e2e

@danehans
Copy link
Contributor Author

/ci-clustermesh

@danehans
Copy link
Contributor Author

danehans commented Apr 1, 2024

/ci-ginkgo

@danehans
Copy link
Contributor Author

danehans commented Apr 1, 2024

/ci-e2e

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 1, 2024
@aanm aanm added this pull request to the merge queue Apr 1, 2024
Merged via the queue into cilium:main with commit 7f505d7 Apr 1, 2024
@danehans danehans deleted the issue_19251_ipam_api_refactor branch April 1, 2024 16:58
danehans added a commit to danehans/cilium that referenced this pull request Apr 6, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
2ce3d3d 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request Apr 24, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
9791f60 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request Apr 24, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
daad2f0 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request Apr 24, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
38d0420 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request Apr 24, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
e2c40b1 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 2, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
2d85063 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 3, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
3b20d9c 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 3, 2024
@danehans
datapath: Adds ENI IPv6 Prefix Delegation Support
5c56f40 
Adds datapath support for ENI IPv6 prefix delegation.

Supports cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 3, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Support for ENI Mode
25ca604 
Previously, ENI prefix delegation support was limited to IPv4.
This PR updates existing structs, methods, etc. to support IPv6
prefix delegation. The overall implementation follows the existing
approach taken for IPv4 prefix delegation.

Although AWS assigns a /80 prefix to an ENI, 64 addresses are the
maximum number of allocatable addresses. This restriction can be user
configurable in the future if needed.

Supports cilium#30684

Note: IPv6 metrics are still unsupported and will be added in a
future PR.

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 3, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Support to AWS ENI Provider
8f347b0 
- Updates all providers to support changes to IPAM NodeOpertions interface.
- Updates pkg/aws/ec2 to manage ENI, VPC, etc. IPv6 attributes.
- Updates pkg/aws/eni to manage IPv6 prefix delegation, e.g. address allocation,
  resyncing interfaces, etc.

Supports cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 3, 2024
@danehans
Install: Adds IPv6 Prefix Delegation Flag to ENI IPAM Mode
401c915 
Adds the `awsEnableIPv6PrefixDelegation` boolean flag for
enabling IPv6 prefix delegation for the ENI IPAM mode. This
flag is disabled by default.

Supports cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 7, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
f1deb50 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 8, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
ba008cb 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 10, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
1b5225f 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
danehans added a commit to danehans/cilium that referenced this pull request May 14, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
55e2b07 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
aanm pushed a commit to danehans/cilium that referenced this pull request Jun 17, 2024
@danehans @aanm
IPAM: Adds IPv6 Prefix Delegation Config Option
531ee81 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
github-merge-queue bot pushed a commit that referenced this pull request Jun 17, 2024
@danehans @christarazi
IPAM: Adds IPv6 Prefix Delegation Config Option
2fc54dd 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: #30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
sgargan pushed a commit to sgargan/cilium that referenced this pull request Jun 19, 2024
@danehans
IPAM: Adds IPv6 Prefix Delegation Config Option
111bb73 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
youngnick pushed a commit to youngnick/cilium that referenced this pull request Jun 20, 2024
@danehans @youngnick
IPAM: Adds IPv6 Prefix Delegation Config Option
fdb5a20 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
jrajahalme pushed a commit to jrajahalme/cilium that referenced this pull request Oct 13, 2024
@danehans @jschwinger233
IPAM: Adds IPv6 Prefix Delegation Config Option
0593040 
- `operator/option/config.go`: Adds an option for enabling AWS IPv6 prefix delegation (PD).
- `*_test.go`: Updates IPAM implementation unit tests to call `NewNodeManager()` with IPv6 PD config option.
- `pkg/ipam/node.go`: Adds `ipv6Alloc` field to `Node` type to represent IPv6-specific allocation node attributes.
- `pkg/ipam/node_manager.go`: Adds IPv6 PD field to the `NodeManager` type and associated `NewNodeManager()`.

Supports: cilium#30684

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christarazi christarazi christarazi approved these changes

@aanm aanm aanm approved these changes

@tommyp1ckles tommyp1ckles tommyp1ckles approved these changes

Assignees
No one assigned
Labels
area/ipam IP address management, including cloud IPAM kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@danehans @aanm @christarazi @tommyp1ckles