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

Automated cherry pick of #44053 #44313 #44315

Conversation

thockin
Copy link
Member

@thockin thockin commented Apr 11, 2017

Cherry pick of #44053 #44313 on release-1.6.

#44053: Add tests for kube-proxy healthcheck, fix bug
#44313: Zero-out healthchecks when no endpoints

Fix corner-case with OnlyLocal Service healthchecks

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Apr 11, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 11, 2017
@thockin thockin assigned MrHohn and unassigned smarterclayton Apr 11, 2017
@thockin thockin added this to the v1.6 milestone Apr 11, 2017
@thockin
Copy link
Member Author

thockin commented Apr 11, 2017

This brings in the rest of #44053

@k8s-github-robot k8s-github-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 11, 2017
@enisoc enisoc added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Apr 11, 2017
@enisoc
Copy link
Member

enisoc commented Apr 11, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 11, 2017
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

LGTM

The failures seem to be introduced by commit 2a6083c, which is not in 1.6.

@thockin thockin force-pushed the automated-cherry-pick-of-#44053-#44313-upstream-release-1.6 branch from 20adb85 to 03102ec Compare April 11, 2017 23:15
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 11, 2017
@MrHohn
Copy link
Member

MrHohn commented Apr 11, 2017

Sorry, the commits seem a bit weird to me...Why we have two federation commits in the middle?

@freehan
Copy link
Contributor

freehan commented Apr 11, 2017

Need to clean those federation commits. This is generally caused by reverts in HEAD.

The existing healthcheck lib was pretty complicated and was hiding some
bugs (like the count always being 1),  This is a reboot of the interface
and implementation to be significantly simpler and better tested.
@thockin thockin force-pushed the automated-cherry-pick-of-#44053-#44313-upstream-release-1.6 branch from 03102ec to ef39e80 Compare April 11, 2017 23:55
@MrHohn
Copy link
Member

MrHohn commented Apr 12, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 12, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrHohn, enisoc, thockin

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 598b503 into kubernetes:release-1.6 Apr 12, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@k8s-ci-robot
Copy link
Contributor

@thockin: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins GCI GCE e2e ef39e80 link @k8s-bot gci gce e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

k8s-github-robot pushed a commit that referenced this pull request Apr 18, 2017
Automatic merge from submit-queue

Manual cherry pick of part of #44053 to release-1.5

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**:

```release-note
Fix for kube-proxy healthcheck handling an update that simultaneously removes one port and adds another.
```
mintzhao pushed a commit to mintzhao/kubernetes that referenced this pull request Jun 1, 2017
…k-of-#44053-kubernetes#44313-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of kubernetes#44053 kubernetes#44313

Cherry pick of kubernetes#44053 kubernetes#44313 on release-1.6.

kubernetes#44053: Add tests for kube-proxy healthcheck, fix bug
kubernetes#44313: Zero-out healthchecks when no endpoints

```release-note
Fix corner-case with OnlyLocal Service healthchecks
```
@thockin thockin deleted the automated-cherry-pick-of-#44053-#44313-upstream-release-1.6 branch August 14, 2019 17:44
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet