Update ingress godeps

vendor/k8s.io/kubernetes/pkg/storage/interfaces.go

@@ -51,15 +51,47 @@ type ResponseMeta struct {
 	ResourceVersion uint64
 }
 
-// FilterFunc is a predicate which takes an API object and returns true
-// if and only if the object should remain in the set.
-type FilterFunc func(obj runtime.Object) bool
+// MatchValue defines a pair (<index name>, <value for that index>).
+type MatchValue struct {
+	IndexName string
+	Value     string
+}
 
-// Everything is a FilterFunc which accepts all objects.
-func Everything(runtime.Object) bool {
+// TriggerPublisherFunc is a function that takes an object, and returns a list of pairs
+// (<index name>, <index value for the given object>) for all indexes known
+// to that function.
+type TriggerPublisherFunc func(obj runtime.Object) []MatchValue
+
+// Filter is interface that is used to pass filtering mechanism.
+type Filter interface {
+	// Filter is a predicate which takes an API object and returns true
+	// if and only if the object should remain in the set.
+	Filter(obj runtime.Object) bool
+	// For any triggers known to the Filter, if Filter() can return only
+	// (a subset of) objects for which indexing function returns <value>,
+	// (<index name>, <value> pair would be returned.
+	//
+	// This is optimization to avoid computing Filter() function (which are
+	// usually relatively expensive) in case we are sure they will return
+	// false anyway.
+	Trigger() []MatchValue
+}
+
+// Everything is a Filter which accepts all objects.
+var Everything Filter = everything{}
+
+// everything is implementation of Everything.
+type everything struct {
+}
+
+func (e everything) Filter(runtime.Object) bool {
 	return true
 }
 
+func (e everything) Trigger() []MatchValue {
+	return nil
+}
+
 // Pass an UpdateFunc to Interface.GuaranteedUpdate to make an update
 // that is guaranteed to succeed.
 // See the comment for GuaranteedUpdate for more details.
@@ -77,14 +109,9 @@ func NewUIDPreconditions(uid string) *Preconditions {
 	return &Preconditions{UID: &u}
 }
 
-// Interface offers a common interface for object marshaling/unmarshling operations and
+// Interface offers a common interface for object marshaling/unmarshaling operations and
 // hides all the storage-related operations behind it.
 type Interface interface {
-	// Returns list of servers addresses of the underyling database.
-	// TODO: This method is used only in a single place. Consider refactoring and getting rid
-	// of this method from the interface.
-	Backends(ctx context.Context) []string
-
 	// Returns Versioner associated with this interface.
 	Versioner() Versioner
 
@@ -102,14 +129,14 @@ type Interface interface {
 	// resourceVersion may be used to specify what version to begin watching,
 	// which should be the current resourceVersion, and no longer rv+1
 	// (e.g. reconnecting without missing any updates).
-	Watch(ctx context.Context, key string, resourceVersion string, filter FilterFunc) (watch.Interface, error)
+	Watch(ctx context.Context, key string, resourceVersion string, filter Filter) (watch.Interface, error)
 
 	// WatchList begins watching the specified key's items. Items are decoded into API
 	// objects and any item passing 'filter' are sent down to returned watch.Interface.
 	// resourceVersion may be used to specify what version to begin watching,
 	// which should be the current resourceVersion, and no longer rv+1
 	// (e.g. reconnecting without missing any updates).
-	WatchList(ctx context.Context, key string, resourceVersion string, filter FilterFunc) (watch.Interface, error)
+	WatchList(ctx context.Context, key string, resourceVersion string, filter Filter) (watch.Interface, error)
 
 	// Get unmarshals json found at key into objPtr. On a not found error, will either
 	// return a zero object of the requested type, or an error, depending on ignoreNotFound.
@@ -118,13 +145,13 @@ type Interface interface {
 
 	// GetToList unmarshals json found at key and opaque it into *List api object
 	// (an object that satisfies the runtime.IsList definition).
-	GetToList(ctx context.Context, key string, filter FilterFunc, listObj runtime.Object) error
+	GetToList(ctx context.Context, key string, filter Filter, listObj runtime.Object) error
 
 	// List unmarshalls jsons found at directory defined by key and opaque them
 	// into *List api object (an object that satisfies runtime.IsList definition).
 	// The returned contents may be delayed, but it is guaranteed that they will
 	// be have at least 'resourceVersion'.
-	List(ctx context.Context, key string, resourceVersion string, filter FilterFunc, listObj runtime.Object) error
+	List(ctx context.Context, key string, resourceVersion string, filter Filter, listObj runtime.Object) error
 
 	// GuaranteedUpdate keeps calling 'tryUpdate()' to update key 'key' (of type 'ptrToType')
 	// retrying the update until success if there is index conflict.
@@ -155,17 +182,4 @@ type Interface interface {
 	//    }
 	// })
 	GuaranteedUpdate(ctx context.Context, key string, ptrToType runtime.Object, ignoreNotFound bool, precondtions *Preconditions, tryUpdate UpdateFunc) error
-
-	// Codec provides access to the underlying codec being used by the implementation.
-	Codec() runtime.Codec
-}
-
-// Config interface allows storage tiers to generate the proper storage.interface
-// and reduce the dependencies to encapsulate storage.
-type Config interface {
-	// Creates the Interface base on ConfigObject
-	NewStorage() (Interface, error)
-
-	// This function is used to enforce membership, and return the underlying type
-	GetType() string
 }