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 consul: do not re-register already registered services into release/1.2.x #14926

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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


This PR updates Nomad's Consul service client to do map comparisons
using maps.Equal instead of reflect.DeepEqual. The bug fix is in how
DeepEqual treats nil slices different from empty slices, when actually
they should be treated the same.

Also, we need to avoid comparing TaggedAddress on agent registrations if
none are set on the Nomad side - because Consul will helpfully set that field
for us on its side.

And some drive-by cleanup map[string]struct{} for set.Set

Fixes #14914

@hashicorp-cla
Copy link

hashicorp-cla commented Oct 18, 2022

CLA assistant check
All committers have signed the CLA.

@shoenig shoenig force-pushed the backport/f-consul-service-re-registrations/hopefully-prime-catfish branch from ec625dc to 59a9ede Compare October 18, 2022 14:08
@shoenig shoenig merged commit cecab5b into release/1.2.x Oct 18, 2022
@shoenig shoenig deleted the backport/f-consul-service-re-registrations/hopefully-prime-catfish branch October 18, 2022 14:27
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants