From 92c7e8e802ce03381698d06ebb08d4f39873f406 Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Wed, 13 Nov 2019 11:00:12 +0800 Subject: [PATCH] Fix golint failures * Remove pkg/registry/apps/replicaset Signed-off-by: Chin-Ya Huang --- hack/.golint_failures | 1 - pkg/registry/apps/replicaset/strategy.go | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 1c8c5717290..d3dbb5c561a 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -137,7 +137,6 @@ pkg/proxy/winkernel pkg/proxy/winuserspace pkg/registry/admissionregistration/rest pkg/registry/apps/deployment/storage -pkg/registry/apps/replicaset pkg/registry/apps/replicaset/storage pkg/registry/apps/rest pkg/registry/apps/statefulset/storage diff --git a/pkg/registry/apps/replicaset/strategy.go b/pkg/registry/apps/replicaset/strategy.go index 2c83176876f..750cf406da0 100644 --- a/pkg/registry/apps/replicaset/strategy.go +++ b/pkg/registry/apps/replicaset/strategy.go @@ -154,8 +154,8 @@ func (rsStrategy) AllowUnconditionalUpdate() bool { return true } -// ReplicaSetToSelectableFields returns a field set that represents the object. -func ReplicaSetToSelectableFields(rs *apps.ReplicaSet) fields.Set { +// ToSelectableFields returns a field set that represents the object. +func ToSelectableFields(rs *apps.ReplicaSet) fields.Set { objectMetaFieldsSet := generic.ObjectMetaFieldsSet(&rs.ObjectMeta, true) rsSpecificFieldsSet := fields.Set{ "status.replicas": strconv.Itoa(int(rs.Status.Replicas)), @@ -167,9 +167,9 @@ func ReplicaSetToSelectableFields(rs *apps.ReplicaSet) fields.Set { func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) { rs, ok := obj.(*apps.ReplicaSet) if !ok { - return nil, nil, fmt.Errorf("given object is not a ReplicaSet.") + return nil, nil, fmt.Errorf("given object is not a ReplicaSet") } - return labels.Set(rs.ObjectMeta.Labels), ReplicaSetToSelectableFields(rs), nil + return labels.Set(rs.ObjectMeta.Labels), ToSelectableFields(rs), nil } // MatchReplicaSet is the filter used by the generic etcd backend to route @@ -187,6 +187,7 @@ type rsStatusStrategy struct { rsStrategy } +// StatusStrategy is the default logic invoked when updating object status. var StatusStrategy = rsStatusStrategy{Strategy} func (rsStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {