Merge pull request #17863 from wojtek-t/only_list_options_in_watch

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-02 06:28:28 -08:00
77 changed files with 172 additions and 183 deletions

View File

@@ -34,7 +34,7 @@ type SecretsInterface interface {
Delete(name string) error
List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.SecretList, error)
Get(name string) (*api.Secret, error)
Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error)
Watch(opts unversioned.ListOptions) (watch.Interface, error)
}
// events implements Secrets interface
@@ -93,14 +93,12 @@ func (s *secrets) Get(name string) (*api.Secret, error) {
}
// Watch starts watching for secrets matching the given selectors.
func (s *secrets) Watch(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (watch.Interface, error) {
func (s *secrets) Watch(opts unversioned.ListOptions) (watch.Interface, error) {
return s.client.Get().
Prefix("watch").
Namespace(s.namespace).
Resource("secrets").
VersionedParams(&opts, api.Scheme).
LabelsSelectorParam(label).
FieldsSelectorParam(field).
Watch()
}