From 4979686a8175b6cad694ae2e7c0683384841af15 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Thu, 30 May 2019 13:51:31 -0700 Subject: [PATCH] Check limits for resolve conf outside the loop --- pkg/kubelet/kubelet.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 65c5eb381b1..7a239a1c9a0 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2025,11 +2025,12 @@ func (kl *Kubelet) handleMirrorPod(mirrorPod *v1.Pod, start time.Time) { func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) { start := kl.clock.Now() sort.Sort(sliceutils.PodsByCreationTime(pods)) + // Responsible for checking limits in resolv.conf + // The limits do not have anything to do with individual pods + if kl.dnsConfigurer != nil && kl.dnsConfigurer.ResolverConfig != "" { + kl.dnsConfigurer.CheckLimitsForResolvConf() + } for _, pod := range pods { - // Responsible for checking limits in resolv.conf - if kl.dnsConfigurer != nil && kl.dnsConfigurer.ResolverConfig != "" { - kl.dnsConfigurer.CheckLimitsForResolvConf() - } existingPods := kl.podManager.GetPods() // Always add the pod to the pod manager. Kubelet relies on the pod // manager as the source of truth for the desired state. If a pod does @@ -2066,11 +2067,11 @@ func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) { // being updated from a config source. func (kl *Kubelet) HandlePodUpdates(pods []*v1.Pod) { start := kl.clock.Now() + // Responsible for checking limits in resolv.conf + if kl.dnsConfigurer != nil && kl.dnsConfigurer.ResolverConfig != "" { + kl.dnsConfigurer.CheckLimitsForResolvConf() + } for _, pod := range pods { - // Responsible for checking limits in resolv.conf - if kl.dnsConfigurer != nil && kl.dnsConfigurer.ResolverConfig != "" { - kl.dnsConfigurer.CheckLimitsForResolvConf() - } kl.podManager.UpdatePod(pod) if kubepod.IsMirrorPod(pod) { kl.handleMirrorPod(pod, start)