github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

task reconciliation must look at NamespaceAll, not NamespaceDefault

Browse Source
This commit is contained in:
James DeFelice 2015-09-03 18:01:45 +00:00
parent 473c51593a
commit d1589b9571
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/mesos/pkg/scheduler/scheduler.go
View File

@ -689,8 +689,7 @@ func (k *KubernetesScheduler) makeTaskRegistryReconciler() ReconcilerAction {
// tasks identified by annotations in the Kubernetes pod registry. // tasks identified by annotations in the Kubernetes pod registry.
func (k *KubernetesScheduler) makePodRegistryReconciler() ReconcilerAction { func (k *KubernetesScheduler) makePodRegistryReconciler() ReconcilerAction {
return ReconcilerAction(func(drv bindings.SchedulerDriver, cancel <-chan struct{}) <-chan error { return ReconcilerAction(func(drv bindings.SchedulerDriver, cancel <-chan struct{}) <-chan error {
ctx := api.NewDefaultContext() podList, err := k.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything())
podList, err := k.client.Pods(api.NamespaceValue(ctx)).List(labels.Everything(), fields.Everything())
if err != nil { if err != nil {
return proc.ErrorChanf("failed to reconcile pod registry: %v", err) return proc.ErrorChanf("failed to reconcile pod registry: %v", err)
} }
@ -920,8 +919,7 @@ requestLoop:
} }
func (ks *KubernetesScheduler) recoverTasks() error { func (ks *KubernetesScheduler) recoverTasks() error {
ctx := api.NewDefaultContext() podList, err := ks.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything())
podList, err := ks.client.Pods(api.NamespaceValue(ctx)).List(labels.Everything(), fields.Everything())
if err != nil { if err != nil {
log.V(1).Infof("failed to recover pod registry, madness may ensue: %v", err) log.V(1).Infof("failed to recover pod registry, madness may ensue: %v", err)
return err return err