Skip to content

Backport of fix: add skip_exit to drain_listeners to prevent premature pod termin… into release/1.9.x #1068

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

Open
hc-github-team-consul-core wants to merge 1 commit into
base: release/1.9.x
Choose a base branch
from
+4 −1
Open

Backport of fix: add skip_exit to drain_listeners to prevent premature pod termin… into release/1.9.x #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1064.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
- envoy: add `skip_exit` to `drain_listeners` admin API call to prevent premature pod termination when upgrading to Envoy 1.37+
```
2 changes: 1 addition & 1 deletion pkg/envoy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func (p *Proxy) Run(ctx context.Context) error {
// Note: the caller is responsible for ensuring Drain is not called concurrently
// with Run, as this is thread-unsafe.
func (p *Proxy) Drain() error {
envoyDrainListenersUrl := fmt.Sprintf("http://%s:%v/drain_listeners?inboundonly&graceful", p.cfg.AdminAddr, p.cfg.AdminBindPort)
envoyDrainListenersUrl := fmt.Sprintf("http://%s/drain_listeners?inboundonly&graceful&skip_exit", net.JoinHostPort(p.cfg.AdminAddr, strconv.Itoa(p.cfg.AdminBindPort)))
switch p.getState() {
case stateExited:
// Nothing to do!
Expand Down
Loading