scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

CRI: Add dns option, rename DNSOption to DNSConfig.

Browse Source
This commit is contained in:
Yifan Gu
2016-09-28 18:37:23 -07:00
parent 1e5e4fdb9d
commit 44ca3ea5e0
5 changed files with 223 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/dockershim/docker_sandbox.go
View File

@@ -243,9 +243,10 @@ func makeSandboxDockerConfig(c *runtimeApi.PodSandboxConfig, image string) *dock
hc.PortBindings = portBindings
// Set DNS options.
if dnsOpts := c.GetDnsOptions(); dnsOpts != nil {
hc.DNS = dnsOpts.GetServers()
hc.DNSSearch = dnsOpts.GetSearches()
if dnsConfig := c.GetDnsConfig(); dnsConfig != nil {
hc.DNS = dnsConfig.GetServers()
hc.DNSSearch = dnsConfig.GetSearches()
hc.DNSOptions = dnsConfig.GetOptions()
}
// Apply resource options.