pkg/ipam: Migrate Subnet from net.IPNet to netip.Prefix #39335
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4fdeddc to
d8d224f
Compare
|
/test |
gandro
requested changes
May 5, 2025
Migrate the `CIDR` and `IPv6CIDR` of the `ipamTypes.Subnet` struct from `*cidr.CIDR` to `*netip.Prefix` (`cidr.CIDR` is a light wrapper on top of `net.IPNet`). The `CIDR.AvailableIPs()` method is migrated from the `cidr` package to the `azure/api` one as that's the only place where it's used and updated to work with `netip.Prefix` instead of `CIDR`. The `DeepEqual` and `DeepCopy` methods for `ipamTypes.Subnet` are no longer autogenerated as they can't be since the `Subnet` struct now depends on an external `netip.Prefix` type that does not implement those methods. Related: cilium#24246 Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
|
/test |
doniacld
approved these changes
May 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Migrate the
CIDRandIPv6CIDRfields of theipamTypes.Subnetstruct from*cidr.CIDRto*netip.Prefix(cidr.CIDRis a light wrapper on top ofnet.IPNet).The
CIDR.AvailableIPs()method is migrated from thecidrpackage to theazure/apione as that's the only place where it's used and updated to work withnetip.Prefixinstead ofCIDR.The
DeepEqualandDeepCopymethods foripamTypes.Subnetare no longer autogenerated as they can't be since theSubnetstruct now depends on an externalnetip.Prefixtype that does not implement those methods.Related: #24246
Please ensure your pull request adheres to the following guidelines:
description and a
Fixes: #XXXline if the commit addresses a particularGitHub issue.
Fixes: <commit-id>tag, thenplease add the commit author[s] as reviewer[s] to this issue.