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

Use utilnet.GetIndexedIP instead of replicating the function locally #89001

Merged
merged 1 commit into from Mar 19, 2020
Merged

Use utilnet.GetIndexedIP instead of replicating the function locally #89001

merged 1 commit into from Mar 19, 2020

Conversation

SataQiu
Copy link
Member

@SataQiu SataQiu commented Mar 10, 2020

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Consider that we have implemented GetIndexedIP in k8s.io/utils/net, it's time to clean up redundant implementations in k/k.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 10, 2020
@SataQiu
Copy link
Member Author

SataQiu commented Mar 10, 2020

/test pull-kubernetes-integration

@wojtek-t
Copy link
Member

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SataQiu, wojtek-t

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 Mar 10, 2020
aojea
aojea reviewed Mar 10, 2020
View reviewed changes
pkg/registry/core/service/ipallocator/allocator.go
@@ -187,7 +189,7 @@ func (r *Range) Release(ip net.IP) error {
// ForEach calls the provided function for each allocated IP.
func (r *Range) ForEach(fn func(net.IP)) {
r.alloc.ForEach(func(offset int) {
ip, _ := GetIndexedIP(r.net, offset+1) // +1 because Range doesn't store IP 0
Copy link
Member

@aojea aojea Mar 10, 2020 •
edited

Choose a reason for hiding this comment

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

it also fixes the bug you fixed in the utils repo, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, after that PR gets merged, we can fix the bug by bumping the utils version. 😄

Copy link
Member

@aojea aojea Mar 11, 2020 •
edited

Choose a reason for hiding this comment

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

should we hold this PR until kubernetes/utils#145 merges then?

Copy link
Member

Choose a reason for hiding this comment

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

ahh ok, I got it, we bump utils in a follow-up PR so it automatically gets the fix
scratch las comment

@SataQiu
Copy link
Member Author

SataQiu commented Mar 11, 2020

/sig network
/priority backlog

@k8s-ci-robot k8s-ci-robot added sig/network Categorizes an issue or PR as relevant to SIG Network. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 11, 2020
@SataQiu
Copy link
Member Author

SataQiu commented Mar 19, 2020

/test pull-kubernetes-e2e-kind
/test pull-kubernetes-integration

@SataQiu
Copy link
Member Author

SataQiu commented Mar 19, 2020

/test pull-kubernetes-integration

@k8s-ci-robot k8s-ci-robot merged commit 34f03ae into kubernetes:master Mar 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Mar 19, 2020
@SataQiu SataQiu mentioned this pull request Apr 7, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aojea aojea aojea left review comments

@deads2k deads2k Awaiting requested review from deads2k

@juanvallejo juanvallejo Awaiting requested review from juanvallejo

Assignees

@wojtek-t wojtek-t

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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/network Categorizes an issue or PR as relevant to SIG Network. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@SataQiu @wojtek-t @k8s-ci-robot @aojea