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

Consul service meta #6193

Merged
merged 6 commits into from
Aug 23, 2019
Merged

Conversation

jeromegn
Copy link
Contributor

@jeromegn jeromegn commented Aug 22, 2019

This fixes #4300, it adds a meta field to the service stanza in the job spec. It's then sent along when registering the service.

I've added the meta data to the Hash function as well as the Equals function for the Service struct. Not sure if that's desirable, I assumed it was.

I believe I've followed most steps in the contributing document, except I'm not sure what to do about the changelog. Happy to fix that up though.

@hashicorp-cla
Copy link

hashicorp-cla commented Aug 22, 2019

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@nickethier nickethier left a comment

Choose a reason for hiding this comment

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

Thanks for tackling this! I left one comment about the Hash func but its looking really good.

nomad/structs/services.go Outdated Show resolved Hide resolved
@jeromegn
Copy link
Contributor Author

jeromegn commented Aug 23, 2019 via email

nomad/structs/services.go Outdated Show resolved Hide resolved
@nickethier
Copy link
Member

@jeromebaude sorry for the confusion but you're actually right to leave it there, see my comment.

@jeromegn
Copy link
Contributor Author

@nickethier Ok, I think that should be it. Not sure why that job failed on travis, is that test flaky sometimes? Passed locally. https://travis-ci.org/hashicorp/nomad/jobs/575809975

The netlify website preview seems to point to the UI. I can't make sure my changes will be good there. They're pretty simple, so I'm expecting them to be!

About the changelog and the release cycle. Is it possible to insert this in a a soon-to-be-released version? We're probably going to be running our own fork if not.

@jeromegn
Copy link
Contributor Author

Can somebody retry that Travis build please? Or let me know if this is not a normal failure.

@nickethier
Copy link
Member

Yup looks like a flaky test to me. Great work @jeromegn and thanks for contributing!

@nickethier nickethier merged commit 25e38c8 into hashicorp:master Aug 23, 2019
@github-actions
Copy link

github-actions bot commented Feb 3, 2023

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 3, 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.

Feature Request: Support consul service meta in service stanza
4 participants