Skip to content

Commit ef1af14

Browse files
authored
Merge pull request kubernetes#85172 from c3y1huang/fix/golint_failure/Remove-pkg.registry.apps.replicaset
Fix golint failures for pkg/registry/apps/replicaset
2 parents ee81b30 + 92c7e8e commit ef1af14

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ pkg/proxy/winkernel
136136
pkg/proxy/winuserspace
137137
pkg/registry/admissionregistration/rest
138138
pkg/registry/apps/deployment/storage
139-
pkg/registry/apps/replicaset
140139
pkg/registry/apps/replicaset/storage
141140
pkg/registry/apps/rest
142141
pkg/registry/apps/statefulset/storage

pkg/registry/apps/replicaset/strategy.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ func (rsStrategy) AllowUnconditionalUpdate() bool {
154154
return true
155155
}
156156

157-
// ReplicaSetToSelectableFields returns a field set that represents the object.
158-
func ReplicaSetToSelectableFields(rs *apps.ReplicaSet) fields.Set {
157+
// ToSelectableFields returns a field set that represents the object.
158+
func ToSelectableFields(rs *apps.ReplicaSet) fields.Set {
159159
objectMetaFieldsSet := generic.ObjectMetaFieldsSet(&rs.ObjectMeta, true)
160160
rsSpecificFieldsSet := fields.Set{
161161
"status.replicas": strconv.Itoa(int(rs.Status.Replicas)),
@@ -167,9 +167,9 @@ func ReplicaSetToSelectableFields(rs *apps.ReplicaSet) fields.Set {
167167
func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
168168
rs, ok := obj.(*apps.ReplicaSet)
169169
if !ok {
170-
return nil, nil, fmt.Errorf("given object is not a ReplicaSet.")
170+
return nil, nil, fmt.Errorf("given object is not a ReplicaSet")
171171
}
172-
return labels.Set(rs.ObjectMeta.Labels), ReplicaSetToSelectableFields(rs), nil
172+
return labels.Set(rs.ObjectMeta.Labels), ToSelectableFields(rs), nil
173173
}
174174

175175
// MatchReplicaSet is the filter used by the generic etcd backend to route
@@ -187,6 +187,7 @@ type rsStatusStrategy struct {
187187
rsStrategy
188188
}
189189

190+
// StatusStrategy is the default logic invoked when updating object status.
190191
var StatusStrategy = rsStatusStrategy{Strategy}
191192

192193
func (rsStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {

0 commit comments

Comments
 (0)