Backport of fix: add skip_exit to drain_listeners to prevent premature pod termin… into release/2.0.x#1076
Merged
hc-github-team-consul-core merged 1 commit intoApr 29, 2026
Conversation
hc-github-team-consul-core
force-pushed
the
backport/spulluri/fix_envoy_drain_issue_main/infinitely-nice-clam
branch
from
f408421 to
1a7deb1
Compare
github-team-consul-core-pr-approver
approved these changes
Apr 29, 2026
Collaborator
github-team-consul-core-pr-approver
left a comment
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
santoshpulluri
approved these changes
Apr 29, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport
This PR is auto-generated from #1064 to be assessed for backporting due to the inclusion of the label backport/2.0.
The below text is copied from the body of the original PR.
Description
When upgrading Envoy from 1.35 to 1.37, pods were being terminated early
during graceful shutdown. The POST /drain_listeners?graceful endpoint causes
Envoy to automatically exit after the drain period (--drain-time-s), which
raced against consul-dataplane's own lifecycle sequencing:
Drain() → wait shutdownGracePeriodSeconds → Quit() → Kill()
Adding &skip_exit decouples the drain phase from the exit decision, ensuring
Envoy stays alive until consul-dataplane explicitly calls Quit() via
/quitquitquit, preserving the intended shutdown lifecycle control.
Overview of commits