optimize field.Set{} -> nil

This commit is contained in:
Hongchao Deng 2016-08-15 11:41:25 -07:00
parent 75fe25e717
commit eb516fbc0a
11 changed files with 15 additions and 11 deletions

View File

@ -184,5 +184,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *certificates.CertificateSigningRequest) fields.Set {
return fields.Set{}
return nil
}

View File

@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.ClusterRole) fields.Set {
return fields.Set{}
return nil
}

View File

@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.ClusterRoleBinding) fields.Set {
return fields.Set{}
return nil
}

View File

@ -68,7 +68,11 @@ func (s *SelectionPredicate) Matches(obj runtime.Object) (bool, error) {
if err != nil {
return false, err
}
return s.Label.Matches(labels) && s.Field.Matches(fields), nil
matched := s.Label.Matches(labels)
if s.Field != nil {
matched = (matched && s.Field.Matches(fields))
}
return matched, nil
}
// MatchesSingle will return (name, true) if and only if s.Field matches on the object's

View File

@ -85,7 +85,7 @@ func (autoscalerStrategy) AllowUnconditionalUpdate() bool {
}
func AutoscalerToSelectableFields(hpa *autoscaling.HorizontalPodAutoscaler) fields.Set {
return fields.Set{}
return nil
}
func MatchAutoscaler(label labels.Selector, field fields.Selector) *generic.SelectionPredicate {

View File

@ -75,7 +75,7 @@ func (limitrangeStrategy) AllowUnconditionalUpdate() bool {
}
func LimitRangeToSelectableFields(limitRange *api.LimitRange) fields.Set {
return fields.Set{}
return nil
}
func (limitrangeStrategy) Export(api.Context, runtime.Object, bool) error {

View File

@ -83,7 +83,7 @@ func (podTemplateStrategy) Export(ctx api.Context, obj runtime.Object, exact boo
}
func PodTemplateToSelectableFields(podTemplate *api.PodTemplate) fields.Set {
return fields.Set{}
return nil
}
func MatchPodTemplate(label labels.Selector, field fields.Selector) *generic.SelectionPredicate {

View File

@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.Role) fields.Set {
return fields.Set{}
return nil
}

View File

@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.RoleBinding) fields.Set {
return fields.Set{}
return nil
}

View File

@ -94,5 +94,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *extensions.ThirdPartyResource) fields.Set {
return fields.Set{}
return nil
}

View File

@ -91,5 +91,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre
// SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *extensions.ThirdPartyResourceData) fields.Set {
return fields.Set{}
return nil
}