-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This add supports for systemd-resolved via
agent.json by adding `"DNSResolverType": "systemd"` to the linux platform config [#187214132] bosh-agent systemd-resolved
- Loading branch information
Showing
17 changed files
with
493 additions
and
331 deletions.
There are no files selected for viewing
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
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
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
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package dnsresolver | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "html/template" | ||
| gonet "net" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| bosherr "github.com/cloudfoundry/bosh-utils/errors" | ||
| boshsys "github.com/cloudfoundry/bosh-utils/system" | ||
| ) | ||
|
|
||
| const ( | ||
| resolvConfTemplate = `# Generated by bosh-agent | ||
| {{ range .DNSServers }}nameserver {{ . }} | ||
| {{ end }}` | ||
| ) | ||
|
|
||
| type resolveConfResolver struct { | ||
| fs boshsys.FileSystem | ||
| cmdRunner boshsys.CmdRunner | ||
| } | ||
|
|
||
| func NewResolveConfResolver( | ||
| fs boshsys.FileSystem, | ||
| cmdRunner boshsys.CmdRunner, | ||
| ) DNSResolver { | ||
| return &resolveConfResolver{ | ||
| fs: fs, | ||
| cmdRunner: cmdRunner, | ||
| } | ||
| } | ||
|
|
||
| func (d *resolveConfResolver) Validate(dnsServers []string) error { | ||
| if len(dnsServers) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| resolvConfContents, err := d.fs.ReadFileString("/etc/resolv.conf") | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Reading /etc/resolv.conf") | ||
| } | ||
|
|
||
| for _, dnsServer := range dnsServers { | ||
| if strings.Contains(resolvConfContents, dnsServer) { | ||
| return nil | ||
| } | ||
|
|
||
| canonicalIP := gonet.ParseIP(dnsServer) | ||
|
|
||
| if canonicalIP != nil { | ||
| if strings.Contains(resolvConfContents, canonicalIP.String()) { | ||
| return nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return bosherr.WrapError(err, "None of the DNS servers that were specified in the manifest were found in /etc/resolv.conf.") | ||
| } | ||
|
|
||
| func (d *resolveConfResolver) SetupDNS(dnsServers []string) error { | ||
| buffer := bytes.NewBuffer([]byte{}) | ||
|
|
||
| t := template.Must(template.New("resolv-conf").Parse(resolvConfTemplate)) | ||
|
|
||
| type dnsConfigArg struct { | ||
| DNSServers []string | ||
| } | ||
|
|
||
| dnsServersArg := dnsConfigArg{dnsServers} | ||
|
|
||
| err := t.Execute(buffer, dnsServersArg) | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Generating DNS config from template") | ||
| } | ||
|
|
||
| if len(dnsServers) > 0 { //nolint:nestif | ||
| // Write out base so that releases may overwrite head | ||
| err = d.fs.WriteFile("/etc/resolvconf/resolv.conf.d/base", buffer.Bytes()) | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Writing to /etc/resolvconf/resolv.conf.d/base") | ||
| } | ||
| } else { | ||
| // For the first time before resolv.conf is symlinked to /run/... | ||
| // inherit possibly configured resolv.conf | ||
|
|
||
| targetPath, err := d.fs.ReadAndFollowLink("/etc/resolv.conf") | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Reading /etc/resolv.conf symlink") | ||
| } | ||
|
|
||
| expectedPath, err := filepath.Abs("/etc/resolv.conf") | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Resolving path to native OS") | ||
| } | ||
| if targetPath == expectedPath { | ||
| err := d.fs.CopyFile("/etc/resolv.conf", "/etc/resolvconf/resolv.conf.d/base") | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Copying /etc/resolv.conf for backwards compat") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| err = d.fs.Symlink("/run/resolvconf/resolv.conf", "/etc/resolv.conf") | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Setting up /etc/resolv.conf symlink") | ||
| } | ||
|
|
||
| _, _, _, err = d.cmdRunner.RunCommand("resolvconf", "-u") | ||
| if err != nil { | ||
| return bosherr.WrapError(err, "Updating resolvconf") | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.