Manual cherry pick of part of #44053 to release-1.5 #44365
Merged
Conversation
This file contains 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
This is a manual application of git commit 7664b97 to release-1.5 branch. The unit test part is dropped as it has too many dependencies that shouldn't be cherry picked. 7664b97: Add tests for kube-proxy healthcheck, fix bug Adding test cases for HC updates found a bug with an update that simultaneously removes one port and adds another. Map iteration is randomized, so sometimes no HC would be created.
Service update that simultaneously removes one port and adds another will trigger OnServiceUpdate to mistakenly remove health check on nodes. This commit fixes the health check deletion logic. This is a surgical fix only in 1.5 for the health check bug (kubernetes#44053). It does not exist on 1.6+ as we overhauled healthcheck package completely.
k8s-ci-robot
added
the
cncf-cla: yes
|
This change is |
k8s-github-robot
added
do-not-merge
|
/unassign @smarterclayton @bprashanth |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: MrHohn, thockin
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
k8s-github-robot
added
the
approved
|
@saad-ali Not sure who is handling 1.5 patch release? |
|
@mwielgus We'd like to check the fix in for 1.5.7 :) |
|
Ping @@mwielgus :) |
mwielgus
added
cherry-pick-approved
|
@mwielgus Thanks! |
|
Automatic merge from submit-queue |
|
Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked. |
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.
This cherry pick has the same purpose as #44246 and #44315.
The first commit is a manual application of git commit 7664b97 to
release-1.5 branch. The unit test part is dropped as it has too
many dependencies that shouldn't be cherry picked.
The second commit is a surgical fix that does not exist on 1.6+, as
we overhauled healthcheck package completely. It fixes the health
check deletion logic in OnServiceUpdate for the same bug.
@thockin @freehan
Release note: