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

Update to latest version of kubernetes CRI API

Browse source 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
This commit is contained in:
Mrunal Patel 2016-10-20 18:33:50 -04:00
parent e14e6c7cfc
commit b117dd863c
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

@ -158,8 +158,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 {