Fix the stack informer's selector used to track deployment
Old selector was wrong (it watched for the label we applied to child resources when reconciling the stack, instead of the stack itself) This should be back-ported to older version of the CLI Signed-off-by: Simon Ferquel <simon.ferquel@docker.com> (cherry picked from commit8cd74eb33a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit:f89d05edcbComponent: cli
This commit is contained in:
committed by
Sebastiaan van Stijn
parent
044022b8c7
commit
515ac23e13
@@ -10,6 +10,7 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
apiv1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/fields"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
runtimeutil "k8s.io/apimachinery/pkg/util/runtime"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
@@ -240,12 +241,12 @@ func newStackInformer(stacksClient stackListWatch, stackName string) cache.Share
|
||||
return cache.NewSharedInformer(
|
||||
&cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||
options.LabelSelector = labels.SelectorForStack(stackName)
|
||||
options.FieldSelector = fields.OneTermEqualSelector("metadata.name", stackName).String()
|
||||
return stacksClient.List(options)
|
||||
},
|
||||
|
||||
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||
options.LabelSelector = labels.SelectorForStack(stackName)
|
||||
options.FieldSelector = fields.OneTermEqualSelector("metadata.name", stackName).String()
|
||||
return stacksClient.Watch(options)
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user