Skip to content

Backport of Fix Peering Service Cleanup Bug into release/1.14.x#16572

Merged
hc-github-team-consul-core merged 2 commits into
release/1.14.xfrom
backport/fix-peering-state-squash/frequently-deep-pangolin
Mar 8, 2023
Merged

Backport of Fix Peering Service Cleanup Bug into release/1.14.x#16572
hc-github-team-consul-core merged 2 commits into
release/1.14.xfrom
backport/fix-peering-state-squash/frequently-deep-pangolin

Conversation

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

Backport

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

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


Description

This fixes a bug where cleanupKindServiceName was called for a peered service. If a local service with the same name exists, the local service's entry in tableKindServiceNames is unexpectedly deleted.

PR Checklist

  • updated test coverage - I'm making a follow-up ticket to automate testing this in the consul-k8s repository.
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-peering-state-squash/frequently-deep-pangolin branch 2 times, most recently from 2f9ec42 to 2badcc4 Compare March 8, 2023 16:24
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) March 8, 2023 16:24
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 84cb618 into release/1.14.x Mar 8, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/fix-peering-state-squash/frequently-deep-pangolin branch March 8, 2023 16:58
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.

3 participants