Fix network.dns interpolation #12817
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
mentioned this pull request
ghost
changed the title
ghost
marked this pull request as ready for review
ghost
commented
Apr 28, 2022
| @@ -1041,10 +1041,11 @@ func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig { | |||
| if alloc.AllocatedResources != nil && len(alloc.AllocatedResources.Shared.Networks) > 0 { | |||
| allocDNS := alloc.AllocatedResources.Shared.Networks[0].DNS | |||
| if allocDNS != nil { | |||
| interpolatedNetworks := taskenv.InterpolateNetworks(env, alloc.AllocatedResources.Shared.Networks) | |||
There was a problem hiding this comment.
My suspicion is that there should be a better place to put this (ie this should probably be in a hook file), but this does have the value of actually working
shoenig
moved this from Needs Triage
to Needs Roadmapping
in Nomad - Community Issues Triage
shoenig
moved this from Needs Roadmapping
to In Progress
in Nomad - Community Issues Triage
shoenig
approved these changes
May 17, 2022
shoenig
added
backport/1.2.x
This was referenced May 17, 2022
ghost
mentioned this pull request
ghost
pushed a commit
to grapl-security/grapl
that referenced
this pull request
Aug 18, 2022
Now that hashicorp/nomad#12817 is merged in as of Nomad 1.3.2, we should stop using the hax to get the host IP and instead use Nomad's native method to get the host IP.
ghost
mentioned this pull request
|
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. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This fixes #12780
When #12021 was introduced, it doesn't actually work for the group -> network -> dns stanza. This PR finishes the work to get network.dns interpolation working, by actually using the interpolated DNS values.