github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100393 from adisky/fix-dns

Browse Source 
Fix structured logs for  pkg/kubelet/network/dns/dns.go
This commit is contained in:
Kubernetes Prow Robot 2021-03-22 16:09:36 -07:00 committed by GitHub
commit f8e55fe974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,9 +121,9 @@ func (c *Configurer) formDNSSearchFitsLimits(composedSearch []string, pod *v1.Po
} }
if limitsExceeded { if limitsExceeded {
log := fmt.Sprintf("Search Line limits were exceeded, some search paths have been omitted, the applied search line is: %s", strings.Join(composedSearch, " ")) err := fmt.Errorf("Search Line limits were exceeded, some search paths have been omitted, the applied search line is: %s", strings.Join(composedSearch, " "))
c.recorder.Event(pod, v1.EventTypeWarning, "DNSConfigForming", log) c.recorder.Event(pod, v1.EventTypeWarning, "DNSConfigForming", err.Error())
klog.ErrorS(nil, "eventlog", log) klog.ErrorS(err, "Search Line limits exceeded")
} }
return composedSearch return composedSearch
} }
@ -131,9 +131,9 @@ func (c *Configurer) formDNSSearchFitsLimits(composedSearch []string, pod *v1.Po
func (c *Configurer) formDNSNameserversFitsLimits(nameservers []string, pod *v1.Pod) []string { func (c *Configurer) formDNSNameserversFitsLimits(nameservers []string, pod *v1.Pod) []string {
if len(nameservers) > validation.MaxDNSNameservers { if len(nameservers) > validation.MaxDNSNameservers {
nameservers = nameservers[0:validation.MaxDNSNameservers] nameservers = nameservers[0:validation.MaxDNSNameservers]
log := fmt.Sprintf("Nameserver limits were exceeded, some nameservers have been omitted, the applied nameserver line is: %s", strings.Join(nameservers, " ")) err := fmt.Errorf("Nameserver limits were exceeded, some nameservers have been omitted, the applied nameserver line is: %s", strings.Join(nameservers, " "))
c.recorder.Event(pod, v1.EventTypeWarning, "DNSConfigForming", log) c.recorder.Event(pod, v1.EventTypeWarning, "DNSConfigForming", err.Error())
klog.ErrorS(nil, "eventlog", log) klog.ErrorS(err, "Nameserver limits exceeded")
} }
return nameservers return nameservers
} }