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

Backport of fix(control-plane): acl tokens deleted while pods in graceful shutdown into release/1.4.x #3745

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3736 to be assessed for backporting due to the inclusion of the label backport/1.4.x.

The below text is copied from the body of the original PR.


Changes proposed in this PR

  • Users have reported that when GracefulShutdown is enabled, ACL tokens are deleted immediately when a pod goes in to TERMINATING, which can disrupt consul DNS and an app's shutdown procedure if that is required.
  • The new behavior is that if a pod still exists and has GracefulShutdown enabled, we will skip ACL and node cleanup, instead re-queue the event for the longest shutdown period, plus some buffer to cut down on noise.

How I've tested this PR

  • Manual testing in a local kube cluster, deploying an app w/ ACLs and graceful shutdown. I delete a pod and watch the control-plane and consul-dataplane logs to verify when the ACL token is cleaned up.
  • Additional unit tests added.

How I expect reviewers to test this PR

👀 ☕

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/dans/NET-8345/graceful-shutdown-acl-race/greatly-capital-fowl branch from f516f66 to d23bfe4 Compare March 14, 2024 15:28
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) March 14, 2024 15:28
Copy link
Contributor

@DanStough DanStough left a comment

Choose a reason for hiding this comment

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

No changes to this PR from the original.

@hc-github-team-consul-core hc-github-team-consul-core merged commit 1273295 into release/1.4.x Mar 14, 2024
49 checks passed
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/dans/NET-8345/graceful-shutdown-acl-race/greatly-capital-fowl branch March 14, 2024 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants