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

Merge pull request #167 from mrunalp/update_api

Browse source 
Update to latest version of kubernetes CRI API
This commit is contained in:
Antonio Murdaca 2016-10-22 09:17:59 +02:00 • committed by GitHub
commit af55785b53
44 changed files with 2715 additions and 2677 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/sandbox.go
View file

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