Merge pull request #73949 from xichengliudui/fixerrornote

pkg/kubelet/network/dns/dns.go

@@ -190,7 +190,7 @@ func (c *Configurer) CheckLimitsForResolvConf() {
 	return
 }
 
-// parseResolveConf reads a resolv.conf file from the given reader, and parses
+// parseResolvConf reads a resolv.conf file from the given reader, and parses
 // it into nameservers, searches and options, possibly returning an error.
 func parseResolvConf(reader io.Reader) (nameservers []string, searches []string, options []string, err error) {
 	file, err := ioutil.ReadAll(reader)
@@ -280,7 +280,7 @@ func getPodDNSType(pod *v1.Pod) (podDNSType, error) {
 	return podDNSCluster, fmt.Errorf(fmt.Sprintf("invalid DNSPolicy=%v", dnsPolicy))
 }
 
-// Merge DNS options. If duplicated, entries given by PodDNSConfigOption will
+// mergeDNSOptions merges DNS options. If duplicated, entries given by PodDNSConfigOption will
 // overwrite the existing ones.
 func mergeDNSOptions(existingDNSConfigOptions []string, dnsConfigOptions []v1.PodDNSConfigOption) []string {
 	optionsMap := make(map[string]string)

pkg/kubelet/pleg/generic.go

@@ -337,7 +337,7 @@ func (g *GenericPLEG) cacheEnabled() bool {
 	return g.cache != nil
 }
 
-// Preserve an older cached status' pod IP if the new status has no pod IP
+// getPodIP preserves an older cached status' pod IP if the new status has no pod IP
 // and its sandboxes have exited
 func (g *GenericPLEG) getPodIP(pid types.UID, status *kubecontainer.PodStatus) string {
 	if status.IP != "" {