Skip to content

K
k3s
Commit 49523500 authored by Abhi Shah's avatar Abhi Shah
Browse files
Options

Merge pull request #13566 from mesosphere/reconcile-all-pods

MESOS: task reconciliation must look at NamespaceAll, not NamespaceDefault
parents d1c7a5f0 d1589b95
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
contrib/mesos/pkg/scheduler/scheduler.go
View file @ 49523500
...@@ -689,8 +689,7 @@ func (k *KubernetesScheduler) makeTaskRegistryReconciler() ReconcilerAction { ...@@ -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: ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment