vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #188 from nalind/dns

Browse source 
Handle PodSandboxConfig.DNSConfig.Options
This commit is contained in:
Mrunal Patel 2016-11-03 11:00:49 -06:00 committed by GitHub
commit 97655c3e7b
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/sandbox.go
View file

@ -162,8 +162,9 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
// set DNS options // set DNS options
dnsServers := req.GetConfig().GetDnsConfig().GetServers() dnsServers := req.GetConfig().GetDnsConfig().GetServers()
dnsSearches := req.GetConfig().GetDnsConfig().GetSearches() dnsSearches := req.GetConfig().GetDnsConfig().GetSearches()
dnsOptions := req.GetConfig().GetDnsConfig().GetOptions()
resolvPath := fmt.Sprintf("%s/resolv.conf", podSandboxDir) resolvPath := fmt.Sprintf("%s/resolv.conf", podSandboxDir)
err = parseDNSOptions(dnsServers, dnsSearches, resolvPath) err = parseDNSOptions(dnsServers, dnsSearches, dnsOptions, resolvPath)
if err != nil { if err != nil {
err1 := removeFile(resolvPath) err1 := removeFile(resolvPath)
if err1 != nil { if err1 != nil {

13
server/utils.go
View file

@ -74,10 +74,11 @@ func removeFile(path string) error {
return nil return nil
} }
func parseDNSOptions(servers, searches []string, path string) error { func parseDNSOptions(servers, searches, options []string, path string) error {
nServers := len(servers) nServers := len(servers)
nSearches := len(searches) nSearches := len(searches)
if nServers == 0 && nSearches == 0 { nOptions := len(options)
if nServers == 0 && nSearches == 0 && nOptions == 0 {
return copyFile("/etc/resolv.conf", path) return copyFile("/etc/resolv.conf", path)
} }
@ -107,5 +108,13 @@ func parseDNSOptions(servers, searches []string, path string) error {
} }
} }
if nOptions > 0 {
data := fmt.Sprintf("options %s\n", strings.Join(options, " "))
_, err = f.Write([]byte(data))
if err != nil {
return err
}
}
return nil return nil
} }