From d1589b9571d73a4ab099e75fa5acf959e647e9e8 Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Thu, 3 Sep 2015 18:01:45 +0000 Subject: [PATCH] task reconciliation must look at NamespaceAll, not NamespaceDefault --- contrib/mesos/pkg/scheduler/scheduler.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/mesos/pkg/scheduler/scheduler.go b/contrib/mesos/pkg/scheduler/scheduler.go index d15e19bf0fd..7a2ead5cf6d 100644 --- a/contrib/mesos/pkg/scheduler/scheduler.go +++ b/contrib/mesos/pkg/scheduler/scheduler.go @@ -689,8 +689,7 @@ func (k *KubernetesScheduler) makeTaskRegistryReconciler() ReconcilerAction { // tasks identified by annotations in the Kubernetes pod registry. func (k *KubernetesScheduler) makePodRegistryReconciler() ReconcilerAction { return ReconcilerAction(func(drv bindings.SchedulerDriver, cancel <-chan struct{}) <-chan error { - ctx := api.NewDefaultContext() - podList, err := k.client.Pods(api.NamespaceValue(ctx)).List(labels.Everything(), fields.Everything()) + podList, err := k.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) if err != nil { return proc.ErrorChanf("failed to reconcile pod registry: %v", err) } @@ -920,8 +919,7 @@ requestLoop: } func (ks *KubernetesScheduler) recoverTasks() error { - ctx := api.NewDefaultContext() - podList, err := ks.client.Pods(api.NamespaceValue(ctx)).List(labels.Everything(), fields.Everything()) + podList, err := ks.client.Pods(api.NamespaceAll).List(labels.Everything(), fields.Everything()) if err != nil { log.V(1).Infof("failed to recover pod registry, madness may ensue: %v", err) return err