From d7754833813170b37cf21d2232ac963ebd52d691 Mon Sep 17 00:00:00 2001 From: a2ush Date: Sat, 11 Dec 2021 22:27:38 +0900 Subject: [PATCH 1/2] Fix comment out typo --- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/network/dns/dns.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 0e6f5f946de..16539bd77cf 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -777,7 +777,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, // check node capabilities since the mount path is not the default if len(experimentalMounterPath) != 0 { experimentalCheckNodeCapabilitiesBeforeMount = false - // Replace the nameserver in containerized-mounter's rootfs/etc/resolve.conf with kubelet.ClusterDNS + // Replace the nameserver in containerized-mounter's rootfs/etc/resolv.conf with kubelet.ClusterDNS // so that service name could be resolved klet.dnsConfigurer.SetupDNSinContainerizedMounter(experimentalMounterPath) } diff --git a/pkg/kubelet/network/dns/dns.go b/pkg/kubelet/network/dns/dns.go index 264f14e02b9..019a1cad665 100644 --- a/pkg/kubelet/network/dns/dns.go +++ b/pkg/kubelet/network/dns/dns.go @@ -427,7 +427,7 @@ func (c *Configurer) GetPodDNS(pod *v1.Pod) (*runtimeapi.DNSConfig, error) { return c.formDNSConfigFitsLimits(dnsConfig, pod), nil } -// SetupDNSinContainerizedMounter replaces the nameserver in containerized-mounter's rootfs/etc/resolve.conf with kubelet.ClusterDNS +// SetupDNSinContainerizedMounter replaces the nameserver in containerized-mounter's rootfs/etc/resolv.conf with kubelet.ClusterDNS func (c *Configurer) SetupDNSinContainerizedMounter(mounterPath string) { resolvePath := filepath.Join(strings.TrimSuffix(mounterPath, "/mounter"), "rootfs", "etc", "resolv.conf") dnsString := "" From 393dec26f6ef7d805ca84c00dea85cdcfeaf5c9e Mon Sep 17 00:00:00 2001 From: a2ush Date: Tue, 14 Dec 2021 22:42:57 +0900 Subject: [PATCH 2/2] Change the name of the constant --- pkg/kubelet/network/dns/dns.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/network/dns/dns.go b/pkg/kubelet/network/dns/dns.go index 019a1cad665..cff577bf936 100644 --- a/pkg/kubelet/network/dns/dns.go +++ b/pkg/kubelet/network/dns/dns.go @@ -55,7 +55,7 @@ const ( ) const ( - maxResolveConfLength = 10 * 1 << 20 // 10MB + maxResolvConfLength = 10 * 1 << 20 // 10MB ) // Configurer is used for setting up DNS resolver configuration when launching pods. @@ -230,7 +230,7 @@ func (c *Configurer) CheckLimitsForResolvConf() { // 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 := utilio.ReadAtMost(reader, maxResolveConfLength) + file, err := utilio.ReadAtMost(reader, maxResolvConfLength) if err != nil { return nil, nil, nil, err }