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.

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

ipam: various minor cleanups #23383

Merged
merged 3 commits into from Jan 27, 2023
Merged

ipam: various minor cleanups #23383

merged 3 commits into from Jan 27, 2023

Conversation

tklauser
Copy link
Member

Noticed while working on #22762.

See commit messages for details.

@tklauser tklauser added kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. labels Jan 26, 2023
@tklauser tklauser requested a review from gandro January 26, 2023 12:12
@tklauser tklauser requested review from a team as code owners January 26, 2023 12:12
@tklauser tklauser added the sig/ipam IP address management, including cloud IPAM label Jan 26, 2023
@tklauser
Copy link
Member Author

tklauser commented Jan 26, 2023 •
edited by maintainer-s-little-helper bot

/test

Job 'Cilium-PR-K8s-1.26-kernel-net-next' failed:

Click to show.

Test Name

K8sDatapathConfig Etcd Check connectivity

Failure Output

FAIL: Found 1 io.cilium/app=operator logs matching list of errors that must be investigated:

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.26-kernel-net-next so I can create one.

gandro
gandro approved these changes Jan 26, 2023
View reviewed changes
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Neat, thanks!

@tklauser
ipam/allocator/clusterpool: fix typo in error type name
29e5fad 
s/Colision/Collision/

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser
ipam: remove unused (*IPAM).AllocateIPWithAllocationResult
4b532b2 
The method was introduced in commit 3ce38c9 ("ipam/node: Introduce
ENI info for cilium_host") but was never used.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser
ipam: reuse existing consts for IP family
0111bbd 
Reuse the exported package level consts instead of duplicating them for
reporting metrics.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser
Copy link
Member Author

/test

@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 Jan 26, 2023
@aanm aanm merged commit 030786e into master Jan 27, 2023
@aanm aanm deleted the pr/tklauser/ipam-cleanups branch January 27, 2023 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@christarazi christarazi christarazi approved these changes

Assignees
No one assigned
Labels
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. sig/ipam IP address management, including cloud IPAM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tklauser @gandro @christarazi @aanm