github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84253 from yutedz/kube-solve-check

Browse Source 
Move CheckLimitsForResolvConf to Kubelet#syncLoop
This commit is contained in:
Kubernetes Prow Robot 2019-10-31 18:04:54 -07:00 committed by GitHub
commit b1ac4cda11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/kubelet.go
View File

@ -1831,6 +1831,13 @@ func (kl *Kubelet) syncLoop(updates <-chan kubetypes.PodUpdate, handler SyncHand
factor = 2 factor = 2
) )
duration := base duration := base
// Responsible for checking limits in resolv.conf
// The limits do not have anything to do with individual pods
// Since this is called in syncLoop, we don't need to call it anywhere else
if kl.dnsConfigurer != nil && kl.dnsConfigurer.ResolverConfig != "" {
kl.dnsConfigurer.CheckLimitsForResolvConf()
}
for { for {
if err := kl.runtimeState.runtimeErrors(); err != nil { if err := kl.runtimeState.runtimeErrors(); err != nil {
klog.Errorf("skipping pod synchronization - %v", err) klog.Errorf("skipping pod synchronization - %v", err)
@ -2037,11 +2044,6 @@ func (kl *Kubelet) handleMirrorPod(mirrorPod *v1.Pod, start time.Time) {
func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) { func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) {
start := kl.clock.Now() start := kl.clock.Now()
sort.Sort(sliceutils.PodsByCreationTime(pods)) 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 { for _, pod := range pods {
existingPods := kl.podManager.GetPods() existingPods := kl.podManager.GetPods()
// Always add the pod to the pod manager. Kubelet relies on the pod // Always add the pod to the pod manager. Kubelet relies on the pod
@ -2079,10 +2081,6 @@ func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) {
// being updated from a config source. // being updated from a config source.
func (kl *Kubelet) HandlePodUpdates(pods []*v1.Pod) { func (kl *Kubelet) HandlePodUpdates(pods []*v1.Pod) {
start := kl.clock.Now() 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 { for _, pod := range pods {
kl.podManager.UpdatePod(pod) kl.podManager.UpdatePod(pod)
if kubetypes.IsMirrorPod(pod) { if kubetypes.IsMirrorPod(pod) {