github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6567 from wojtek-t/fix_6059 

Revert "Stop the bleeding for #6059"
pull/6/head
Filip Grzadkowski 2015-04-08 15:03:50 +02:00
parent a265272649 8a5c76356c
commit 24b478dd0a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/config/apiserver.go
View File

@ -18,8 +18,6 @@ limitations under the License.
package config
import (
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"
@ -42,9 +40,7 @@ func newSourceApiserverFromLW(lw cache.ListerWatcher, updates chan<- interface{}
}
updates <- kubelet.PodUpdate{pods, kubelet.SET, kubelet.ApiserverSource}
}
// TODO: the 30 second poll loop is here to mitigate #6059 and
// shouldn't be neeeded once that is resolved.
cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 30*time.Second).Run()
cache.NewReflector(lw, &api.Pod{}, cache.NewUndeltaStore(send, cache.MetaNamespaceKeyFunc), 0).Run()
}
func getHostFieldLabel(apiVersion string) string {

4
plugin/pkg/scheduler/factory/factory.go
View File

@ -143,9 +143,7 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys util.StringSe
}
// Watch and queue pods that need scheduling.
// TODO: the 30 second poll loop is here to mitigate #6059 and
// shouldn't be neeeded once that is resolved.
cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 30*time.Second).Run()
cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 0).Run()
// Pass through all events to the scheduled pod store, but on a deletion,
// also remove from the assumed pods.