scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewritte util.* -> wait.* wherever reasonable

Browse Source
This commit is contained in:
Jan Chaloupka
2016-02-02 11:57:06 +01:00
parent 43a47a8234
commit 4389b3f0d6
71 changed files with 231 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cm/container_manager_linux.go
View File

@@ -33,12 +33,12 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
"k8s.io/kubernetes/pkg/util"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/util/sets"
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
"k8s.io/kubernetes/pkg/util/wait"
)
const (
@@ -272,7 +272,7 @@ func (cm *containerManagerImpl) Start(nodeConfig NodeConfig) error {
}
// Run ensure state functions every minute.
go util.Until(func() {
go wait.Until(func() {
for _, cont := range cm.systemContainers {
if cont.ensureStateFunc != nil {
if err := cont.ensureStateFunc(cont.manager); err != nil {
@@ -280,7 +280,7 @@ func (cm *containerManagerImpl) Start(nodeConfig NodeConfig) error {
}
}
}
}, time.Minute, util.NeverStop)
}, time.Minute, wait.NeverStop)
return nil
}