Enable passing DNS info to the rkt driver #892
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
| @@ -183,6 +186,20 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e | |||
| // Add CPU isolator | |||
| cmdArgs = append(cmdArgs, fmt.Sprintf("--cpu=%vm", int64(task.Resources.CPU))) | |||
|
|
|||
| // Add DNS servers | |||
| for _, ip := range driverConfig.DNSServers { | |||
| if net.ParseIP(ip) != nil { | |||
There was a problem hiding this comment.
if err := net.ParseIP(ip); err != nil {
msg := fmt.Errorf("invalid ip address for container dns server %q: %v", ip, err)
d.logger.Printf("[ERR] driver.rkt: %v", msg)
return msg
} else {
cmdArgs = append(cmdArgs, fmt.Sprintf("--dns=%s", ip))
}
|
LGTM |
|
@dadgar |
| // Add DNS servers | ||
| for _, ip := range driverConfig.DNSServers { | ||
| if err := net.ParseIP(ip); err == nil { | ||
| msg := fmt.Errorf("invalid ip address for container dns server %q: %v", ip, err) |
There was a problem hiding this comment.
Ah if it is will then get rid of the ": %v" part and error in the msg. And now that I think of it, make the log level DEBUG. It is not a Nomad error
dadgar
added a commit
that referenced
this pull request
Mar 10, 2016
Enable passing DNS info to the rkt driver
|
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.
Pass DNS servers and search domains to the rkt CLI. These get written to the container's resolv.conf.