github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues 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

3
pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
View File

@@ -69,9 +69,10 @@ func (m *kubeGenericRuntimeManager) generatePodSandboxConfig(pod *api.Pod, attem
if err != nil {
return nil, err
}
podSandboxConfig.DnsOptions = &runtimeApi.DNSOption{
podSandboxConfig.DnsConfig = &runtimeApi.DNSConfig{
Servers: dnsServers,
Searches: dnsSearches,
Options: defaultDNSOptions,
}
// TODO: Add domain support in new runtime interface
hostname, _, err := m.runtimeHelper.GeneratePodHostNameAndDomain(pod)