Skip to content

Backport of api-gateway: fix cache and service deletion issue into release/1.2.x#2387

Closed
hc-github-team-consul-core wants to merge 3 commits intorelease/1.2.xfrom
backport/NET-4510/fix-deregistration/officially-splendid-liger
Closed

Backport of api-gateway: fix cache and service deletion issue into release/1.2.x#2387
hc-github-team-consul-core wants to merge 3 commits intorelease/1.2.xfrom
backport/NET-4510/fix-deregistration/officially-splendid-liger

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@t-eckert
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "213a4d0ab489c04ddb502e2d5b5a3fe43d29c724", automatic backport requires rebase workflow

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


Changes proposed in this PR:

  • Fixes a bug where deleting a Pod would not delete the corresponding service for a Gateway.

🐞 Bug
When a user would manually delete a Pod running Consul Dataplane for a gateway, the corresponding service in Consul was not getting deleted. This was due to a caching issue where the controller was not updating its store of active Consul services to diff against existing Consul Dataplane pods.

How I've tested this PR:

  • Ran the test locally in Kind, manually deleting Pod and ensuring that stale services don't hang around.
  • Ran the tests against all acceptance tests.
  • Ran the test against a new acceptance test that catches this error (SO to @sarahalsmiller)

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-4510/fix-deregistration/officially-splendid-liger branch from 5ffed83 to 76f194a Compare June 15, 2023 20:30
@t-eckert
Copy link
Copy Markdown
Contributor

Closing this as the backport bot errored. Doing a manual backport.

@t-eckert t-eckert closed this Jun 15, 2023
@t-eckert t-eckert mentioned this pull request Jun 15, 2023
2 tasks
@github-actions github-actions bot deleted the backport/NET-4510/fix-deregistration/officially-splendid-liger branch September 1, 2025 06:06
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.

4 participants