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.

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

Fix incorrect EnableTCPReset for non-TCP protocols #1090

Merged
merged 1 commit into from
Feb 7, 2022

Conversation

lzhecheng
Copy link
Contributor

@lzhecheng lzhecheng commented Jan 30, 2022

Signed-off-by: Zhecheng Li zhechengli@microsoft.com

fixes #1087

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

This code change fixes the bug that UDP services would trigger unnecessary LoadBalancer updates. The root cause is that a field not working for non-TCP protocols is considered.

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


@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jan 30, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @lzhecheng. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 30, 2022
@lzhecheng lzhecheng changed the title Fix incorrect EnableTCPReset for non-TCP protocols [WIP] Fix incorrect EnableTCPReset for non-TCP protocols Jan 30, 2022
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2022
Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) to 80.036% when pulling fe0994b on lzhecheng:fix-enabletcpreset into 6c818cc on kubernetes-sigs:master.

@lzhecheng lzhecheng changed the title [WIP] Fix incorrect EnableTCPReset for non-TCP protocols Fix incorrect EnableTCPReset for non-TCP protocols Jan 30, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2022
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 30, 2022
@feiskyer
Copy link
Member

Could you add a release note?

@nilo19
Copy link
Contributor

nilo19 commented Feb 7, 2022

/retest

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 7, 2022
@lzhecheng
Copy link
Contributor Author

Could you add a release note?

Sure.

Copy link
Member

@feiskyer feiskyer 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 fix.

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, lzhecheng

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 Feb 7, 2022
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-ccm-capz

1 similar comment
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-ccm-capz

@k8s-ci-robot k8s-ci-robot merged commit 7146a59 into kubernetes-sigs:master Feb 7, 2022
@lzhecheng lzhecheng deleted the fix-enabletcpreset branch February 7, 2022 07:33
@feiskyer
Copy link
Member

feiskyer commented Feb 7, 2022

/cherry-pick release-1.23
/cherry-pick release-1.1
/cherry-pick release-1.0
/cherry-pick release-0.7

@k8s-infra-cherrypick-robot

@feiskyer: #1090 failed to apply on top of branch "release-1.23":

Applying: Fix incorrect EnableTCPReset for non-TCP protocols
Using index info to reconstruct a base tree...
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_loadbalancer_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix incorrect EnableTCPReset for non-TCP protocols
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.23
/cherry-pick release-1.1
/cherry-pick release-1.0
/cherry-pick release-0.7

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.

@nilo19
Copy link
Contributor

nilo19 commented Feb 7, 2022

@feiskyer the cherry-pick command needs to be invoked one by one.

@nilo19
Copy link
Contributor

nilo19 commented Feb 7, 2022

@lzhecheng looks we need to do the manual cherry-picks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UDP services may trigger unnecessary LoadBalancer updates
6 participants