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 drainer from pkg instead of our own health #3917

Merged
merged 2 commits into from
Oct 7, 2020
Merged

use drainer from pkg instead of our own health #3917

merged 2 commits into from
Oct 7, 2020

Conversation

vaikas
Copy link
Contributor

@vaikas vaikas commented Aug 24, 2020

Fixes #3912

Proposed Changes

Release Note

- 🐛 Fix bug
ingress / filter now handle proper k8s lifecycle.

Docs

@googlebot googlebot added the cla: yes Indicates the PR's author has signed the CLA. label Aug 24, 2020
@knative-prow-robot knative-prow-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 24, 2020
@knative-prow-robot knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 24, 2020
mattmoor
mattmoor reviewed Aug 24, 2020
View reviewed changes
pkg/mtbroker/filter/filter_handler.go Outdated
@@ -102,7 +102,7 @@ func NewHandler(logger *zap.Logger, triggerLister eventinglisters.TriggerLister,
//
// This method will block until ctx is done.
func (h *Handler) Start(ctx context.Context) error {
return h.receiver.StartListen(ctx, health.WithLivenessCheck(health.WithReadinessCheck(h)))
return h.receiver.StartListen(ctx, &handlers.Drainer{Inner: h})
Copy link
Member

Choose a reason for hiding this comment

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

I think that you need something that calls Drain() when ctx.Done() is closed, see: https://github.com/knative/pkg/blob/673521e55e5b9f081b672c2f97c81c31b1cd2ddc/webhook/webhook.go#L218-L228

Copy link
Contributor

Choose a reason for hiding this comment

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

ping @vaikas

@slinkydeveloper
Copy link
Contributor

@vaikas can you enable this feature in kncloudevents/message_receiver.go? This way, the feature is enabled automatically throughout all channels (IMC, kafka, natss and so on)

@knative-prow-robot knative-prow-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 3, 2020
@knative-prow-robot knative-prow-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 7, 2020
@codecov
Copy link

codecov bot commented Oct 7, 2020 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@deae30c). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3917   +/-   ##
=========================================
  Coverage          ?   65.77%           
=========================================
  Files             ?      316           
  Lines             ?    11004           
  Branches          ?        0           
=========================================
  Hits              ?     7238           
  Misses            ?     3341           
  Partials          ?      425

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update deae30c...3a50e5b. Read the comment docs.

@slinkydeveloper
Copy link
Contributor

slinkydeveloper commented Oct 7, 2020 •
edited
Loading

/lgtm
/approve

Thanks for this one!

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 7, 2020
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: slinkydeveloper, vaikas

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:
  • OWNERS [slinkydeveloper,vaikas]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow-robot knative-prow-robot merged commit 5deb379 into knative:master Oct 7, 2020
@vaikas vaikas deleted the issue-3912 branch October 14, 2020 14:39
@slinkydeveloper slinkydeveloper mentioned this pull request Nov 6, 2020
Closed
@grac3gao-zz grac3gao-zz mentioned this pull request Dec 3, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattmoor mattmoor mattmoor left review comments

@n3wscott n3wscott n3wscott left review comments

@Harwayne Harwayne Awaiting requested review from Harwayne

@lionelvillard lionelvillard Awaiting requested review from lionelvillard

Assignees

@slinkydeveloper slinkydeveloper

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

pkg/health doesn't properly implement K8s lifecycle
6 participants
@vaikas @slinkydeveloper @knative-prow-robot @mattmoor @n3wscott @googlebot