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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Bugfix: Don't recreate servicemap for catalog sync into release/1.3.x #3790

Conversation

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

Backport

This PR is auto-generated from #3785 to be assessed for backporting due to the inclusion of the label backport/1.3.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:
@jmurret
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: "c1921966841cdef99078e40c355470ac8aeb4b85", automatic backport requires rebase workflow

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


Changes proposed in this PR

How I've tested this PR

Existing tests and a manual build/deploy in my environment to confirm we don't register everything

How I expect reviewers to test this PR

With my previous change, if spinning up consul catalog sync you'll see every k8s service become registered regardless of configuration. With this change you should only see intended services become registered.

Checklist


Overview of commits

@jmurret jmurret merged commit 51c61e6 into release/1.3.x Mar 20, 2024
49 checks passed
@jmurret jmurret deleted the backport/jukie/fix-serivce-registration/sensibly-brave-serval branch March 20, 2024 16:24
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.

None yet

3 participants