github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85172 from c3y1huang/fix/golint_failure/Remove-pkg.registry.apps.replicaset

Browse Source 
Fix golint failures for pkg/registry/apps/replicaset
This commit is contained in:
Kubernetes Prow Robot 2019-11-27 01:09:21 -08:00 committed by GitHub
commit ef1af14cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -136,7 +136,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

9
pkg/registry/apps/replicaset/strategy.go
View File

@ -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) {