github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68462 from knightXun/dns

Browse Source 
refactor kubelet/network/dns
This commit is contained in:
k8s-ci-robot 2018-10-01 00:30:04 -07:00 committed by GitHub
commit c847a1f04b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/network/dns/dns.go
View File

@ -239,7 +239,7 @@ func parseResolvConf(reader io.Reader) (nameservers []string, searches []string,
return nameservers, searches, options, utilerrors.NewAggregate(allErrors) return nameservers, searches, options, utilerrors.NewAggregate(allErrors)
} }
func (c *Configurer) getHostDNSConfig(pod *v1.Pod) (*runtimeapi.DNSConfig, error) { func (c *Configurer) getHostDNSConfig() (*runtimeapi.DNSConfig, error) {
var hostDNS, hostSearch, hostOptions []string var hostDNS, hostSearch, hostOptions []string
// Get host DNS settings // Get host DNS settings
if c.ResolverConfig != "" { if c.ResolverConfig != "" {
@ -329,7 +329,7 @@ func appendDNSConfig(existingDNSConfig *runtimeapi.DNSConfig, dnsConfig *v1.PodD
// GetPodDNS returns DNS settings for the pod. // GetPodDNS returns DNS settings for the pod.
func (c *Configurer) GetPodDNS(pod *v1.Pod) (*runtimeapi.DNSConfig, error) { func (c *Configurer) GetPodDNS(pod *v1.Pod) (*runtimeapi.DNSConfig, error) {
dnsConfig, err := c.getHostDNSConfig(pod) dnsConfig, err := c.getHostDNSConfig()
if err != nil { if err != nil {
return nil, err return nil, err
} }