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

remove --cleanup-ipvs flag of kube-proxy #97336

Merged
merged 1 commit into from Jan 4, 2021
Merged

remove --cleanup-ipvs flag of kube-proxy #97336

merged 1 commit into from Jan 4, 2021

Conversation

maaoBit
Copy link
Contributor

@maaoBit maaoBit commented Dec 16, 2020 •
edited by liggitt

Signed-off-by: maao maao420691301@gmail.com

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #96034

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

kube-proxy: remove deprecated --cleanup-ipvs flag of kube-proxy, and make --cleanup flag always to flush IPVS

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

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 16, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @maaoBit. Thanks for your PR.

I'm waiting for a kubernetes 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 16, 2020
@k8s-ci-robot k8s-ci-robot added area/ipvs sig/network Categorizes an issue or PR as relevant to SIG Network. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Dec 16, 2020
@maaoBit
Copy link
Contributor Author

maaoBit commented Dec 16, 2020

/cc @aojea
/sig network

andrewsykim
andrewsykim reviewed Dec 16, 2020
View reviewed changes
pkg/proxy/ipvs/proxier.go Outdated
return true
}
encounteredError = false
err := ipvs.Flush()
Copy link
Member

Choose a reason for hiding this comment

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

This is probably fine but just confirming, this flushes all IPVS rules, not just the Kubernetes managed ones right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, this clears all ipvs rules

andrewsykim
andrewsykim reviewed Dec 16, 2020
View reviewed changes
pkg/proxy/ipvs/proxier.go Outdated
func CleanupLeftovers(ipvs utilipvs.Interface, ipt utiliptables.Interface, ipset utilipset.Interface) (encounteredError bool) {
// Return immediately when ipvs interface is nil - Probably initialization failed in somewhere.
if ipvs == nil {
return true
Copy link
Member

Choose a reason for hiding this comment

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

if IPVS is nil we probably want to still run the iptables clean up, so maybe this should be:

if ipvs != nil {
    // IPVS clean up
}

// rest of the function..

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 16, 2020
@aojea
Copy link
Member

aojea commented Dec 16, 2020

/kind bug
/sig network
/ok-to-test
/assign @andrewsykim

@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. kind/bug Categorizes issue or PR as related to a bug. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Dec 16, 2020
@aojea
Copy link
Member

aojea commented Dec 16, 2020

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 16, 2020
@aojea
Copy link
Member

aojea commented Dec 23, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 23, 2020
dougsland
dougsland reviewed Dec 30, 2020
View reviewed changes
Copy link
Member

@dougsland dougsland left a comment

Choose a reason for hiding this comment

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

LGTM

pkg/proxy/ipvs/proxier.go Outdated
err := ipvs.Flush()
if err != nil {
klog.Errorf("Error flushing IPVS rules: %v", err)
encounteredError = true
}
}

Copy link
Member

Choose a reason for hiding this comment

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

No need extra space.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Has been modified, PTAL

@maaoBit
remove --cleanup-ipvs flag of kube-proxy
d001b9b 
Signed-off-by: maao <maao420691301@gmail.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 31, 2020
dougsland
dougsland reviewed Dec 31, 2020
View reviewed changes
Copy link
Member

@dougsland dougsland left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 31, 2020
andrewsykim
andrewsykim reviewed Jan 4, 2021
View reviewed changes
Copy link
Member

@andrewsykim andrewsykim left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

Thanks @maaoBit

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andrewsykim, maaoBit

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 4, 2021
@k8s-ci-robot k8s-ci-robot merged commit ffe74b2 into kubernetes:master Jan 4, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 4, 2021
@github-actions github-actions bot mentioned this pull request Jan 5, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougsland dougsland dougsland left review comments

@andrewsykim andrewsykim andrewsykim left review comments

@cmluciano cmluciano Awaiting requested review from cmluciano

@MrHohn MrHohn Awaiting requested review from MrHohn

@aojea aojea Awaiting requested review from aojea

Assignees

@dougsland dougsland

@aojea aojea

@andrewsykim andrewsykim

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ipvs cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

kube-proxy --cleanup don‘t clean ipvs rules
5 participants
@maaoBit @k8s-ci-robot @aojea @dougsland @andrewsykim