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

Fix function comment to consistent with its name

Browse Source 
update pull request

update pull request
This commit is contained in:
xichengliudui 2019-02-12 01:00:53 -05:00
parent a1539747db
commit 5dd26ecab5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ func (c *Configurer) CheckLimitsForResolvConf() {
return 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. // it into nameservers, searches and options, possibly returning an error.
func parseResolvConf(reader io.Reader) (nameservers []string, searches []string, options []string, err error) { func parseResolvConf(reader io.Reader) (nameservers []string, searches []string, options []string, err error) {
file, err := ioutil.ReadAll(reader) 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)) 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. // overwrite the existing ones.
func mergeDNSOptions(existingDNSConfigOptions []string, dnsConfigOptions []v1.PodDNSConfigOption) []string { func mergeDNSOptions(existingDNSConfigOptions []string, dnsConfigOptions []v1.PodDNSConfigOption) []string {
optionsMap := make(map[string]string) optionsMap := make(map[string]string)

2
pkg/kubelet/pleg/generic.go
View File

@ -337,7 +337,7 @@ func (g *GenericPLEG) cacheEnabled() bool {
return g.cache != nil 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 // and its sandboxes have exited
func (g *GenericPLEG) getPodIP(pid types.UID, status *kubecontainer.PodStatus) string { func (g *GenericPLEG) getPodIP(pid types.UID, status *kubecontainer.PodStatus) string {
if status.IP != "" { if status.IP != "" {