Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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/connect: interpolate connect block #9586
consul/connect: interpolate connect block #9586
Changes from 1 commit
4d0e745
54653d2
edf1e25
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Somewhat related because we're potentially setting these to
nil
and not empty maps, none of these three fields isCanonicalized
. Should we be doing that and/or should we be assigning an empty map here for safety?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The canonicalized form of empty maps is
nil
(at least in services + consul)nomad/nomad/structs/services.go
Line 174 in a480eed
Copy
also make use of the helper.Copy* functions which also reduce tonil
if there are no elementshttps://github.com/hashicorp/nomad/blob/master/helper/funcs.go#L282
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The caller copies
Service
... shouldn't we already have a copy of thestructs.ConsulConnect
too?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch! Indeed there's no reason to create an extra copy here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you interpolate the sidecar port below. Is there a reason we're not can't for this port?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
ConsulGatewayBindAddress
field is anint
, and there's (currently?) no way to interpolate int valueshttps://github.com/hashicorp/nomad/blob/master/nomad/structs/services.go#L1291