Commit eb516fbc authored by Hongchao Deng's avatar Hongchao Deng

optimize field.Set{} -> nil

parent 75fe25e7
...@@ -184,5 +184,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *certificates.CertificateSigningRequest) fields.Set { func SelectableFields(obj *certificates.CertificateSigningRequest) fields.Set {
return fields.Set{} return nil
} }
...@@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.ClusterRole) fields.Set { func SelectableFields(obj *rbac.ClusterRole) fields.Set {
return fields.Set{} return nil
} }
...@@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.ClusterRoleBinding) fields.Set { func SelectableFields(obj *rbac.ClusterRoleBinding) fields.Set {
return fields.Set{} return nil
} }
...@@ -68,7 +68,11 @@ func (s *SelectionPredicate) Matches(obj runtime.Object) (bool, error) { ...@@ -68,7 +68,11 @@ func (s *SelectionPredicate) Matches(obj runtime.Object) (bool, error) {
if err != nil { if err != nil {
return false, err 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 // MatchesSingle will return (name, true) if and only if s.Field matches on the object's
......
...@@ -85,7 +85,7 @@ func (autoscalerStrategy) AllowUnconditionalUpdate() bool { ...@@ -85,7 +85,7 @@ func (autoscalerStrategy) AllowUnconditionalUpdate() bool {
} }
func AutoscalerToSelectableFields(hpa *autoscaling.HorizontalPodAutoscaler) fields.Set { func AutoscalerToSelectableFields(hpa *autoscaling.HorizontalPodAutoscaler) fields.Set {
return fields.Set{} return nil
} }
func MatchAutoscaler(label labels.Selector, field fields.Selector) *generic.SelectionPredicate { func MatchAutoscaler(label labels.Selector, field fields.Selector) *generic.SelectionPredicate {
......
...@@ -75,7 +75,7 @@ func (limitrangeStrategy) AllowUnconditionalUpdate() bool { ...@@ -75,7 +75,7 @@ func (limitrangeStrategy) AllowUnconditionalUpdate() bool {
} }
func LimitRangeToSelectableFields(limitRange *api.LimitRange) fields.Set { func LimitRangeToSelectableFields(limitRange *api.LimitRange) fields.Set {
return fields.Set{} return nil
} }
func (limitrangeStrategy) Export(api.Context, runtime.Object, bool) error { func (limitrangeStrategy) Export(api.Context, runtime.Object, bool) error {
......
...@@ -83,7 +83,7 @@ func (podTemplateStrategy) Export(ctx api.Context, obj runtime.Object, exact boo ...@@ -83,7 +83,7 @@ func (podTemplateStrategy) Export(ctx api.Context, obj runtime.Object, exact boo
} }
func PodTemplateToSelectableFields(podTemplate *api.PodTemplate) fields.Set { func PodTemplateToSelectableFields(podTemplate *api.PodTemplate) fields.Set {
return fields.Set{} return nil
} }
func MatchPodTemplate(label labels.Selector, field fields.Selector) *generic.SelectionPredicate { func MatchPodTemplate(label labels.Selector, field fields.Selector) *generic.SelectionPredicate {
......
...@@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.Role) fields.Set { func SelectableFields(obj *rbac.Role) fields.Set {
return fields.Set{} return nil
} }
...@@ -118,5 +118,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *rbac.RoleBinding) fields.Set { func SelectableFields(obj *rbac.RoleBinding) fields.Set {
return fields.Set{} return nil
} }
...@@ -94,5 +94,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *extensions.ThirdPartyResource) fields.Set { func SelectableFields(obj *extensions.ThirdPartyResource) fields.Set {
return fields.Set{} return nil
} }
...@@ -91,5 +91,5 @@ func Matcher(label labels.Selector, field fields.Selector) *generic.SelectionPre ...@@ -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 // SelectableFields returns a field set that can be used for filter selection
func SelectableFields(obj *extensions.ThirdPartyResourceData) fields.Set { func SelectableFields(obj *extensions.ThirdPartyResourceData) fields.Set {
return fields.Set{} return nil
} }
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