Skip to content

Commit 95c3a69

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#89980 from agadelshin/68026-pkg-registry-apps-golint
Fix goling issues for pkg/registry/apps
2 parents 5bfe8fe + 3ab5ea0 commit 95c3a69

File tree

6 files changed

+35
-13
lines changed

6 files changed

+35
-13
lines changed

‎hack/.golint_failures‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ pkg/proxy/userspace
128128
pkg/proxy/winkernel
129129
pkg/proxy/winuserspace
130130
pkg/registry/admissionregistration/rest
131-
pkg/registry/apps/deployment/storage
132-
pkg/registry/apps/replicaset/storage
133-
pkg/registry/apps/rest
134-
pkg/registry/apps/statefulset/storage
135131
pkg/registry/auditregistration/rest
136132
pkg/registry/authentication/rest
137133
pkg/registry/authentication/tokenreview

‎pkg/master/master.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
432432
flowcontrolrest.RESTStorageProvider{},
433433
// keep apps after extensions so legacy clients resolve the extensions versions of shared resource names.
434434
// See https://github.com/kubernetes/kubernetes/issues/42392
435-
appsrest.RESTStorageProvider{},
435+
appsrest.StorageProvider{},
436436
admissionregistrationrest.RESTStorageProvider{},
437437
eventsrest.RESTStorageProvider{TTL: c.ExtraConfig.EventTTL},
438438
}

‎pkg/registry/apps/deployment/storage/storage.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ type DeploymentStorage struct {
5353
Rollback *RollbackREST
5454
}
5555

56+
// NewStorage returns new instance of DeploymentStorage.
5657
func NewStorage(optsGetter generic.RESTOptionsGetter) (DeploymentStorage, error) {
5758
deploymentRest, deploymentStatusRest, deploymentRollbackRest, err := NewREST(optsGetter)
5859
if err != nil {
@@ -67,6 +68,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter) (DeploymentStorage, error)
6768
}, nil
6869
}
6970

71+
// REST implements a RESTStorage for Deployments.
7072
type REST struct {
7173
*genericregistry.Store
7274
categories []string
@@ -111,6 +113,7 @@ func (r *REST) Categories() []string {
111113
return r.categories
112114
}
113115

116+
// WithCategories sets categories for REST.
114117
func (r *REST) WithCategories(categories []string) *REST {
115118
r.categories = categories
116119
return r
@@ -121,6 +124,7 @@ type StatusREST struct {
121124
store *genericregistry.Store
122125
}
123126

127+
// New returns empty Deployment object.
124128
func (r *StatusREST) New() runtime.Object {
125129
return &apps.Deployment{}
126130
}
@@ -163,6 +167,7 @@ func (r *RollbackREST) New() runtime.Object {
163167

164168
var _ = rest.NamedCreater(&RollbackREST{})
165169

170+
// Create runs rollback for deployment
166171
func (r *RollbackREST) Create(ctx context.Context, name string, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
167172
rollback, ok := obj.(*apps.DeploymentRollback)
168173
if !ok {
@@ -230,6 +235,7 @@ func (r *RollbackREST) setDeploymentRollback(ctx context.Context, deploymentID s
230235
return finalDeployment, err
231236
}
232237

238+
// ScaleREST implements a Scale for Deployment.
233239
type ScaleREST struct {
234240
store *genericregistry.Store
235241
}
@@ -238,6 +244,7 @@ type ScaleREST struct {
238244
var _ = rest.Patcher(&ScaleREST{})
239245
var _ = rest.GroupVersionKindProvider(&ScaleREST{})
240246

247+
// GroupVersionKind returns GroupVersionKind for Deployment Scale object
241248
func (r *ScaleREST) GroupVersionKind(containingGV schema.GroupVersion) schema.GroupVersionKind {
242249
switch containingGV {
243250
case extensionsv1beta1.SchemeGroupVersion:
@@ -256,6 +263,7 @@ func (r *ScaleREST) New() runtime.Object {
256263
return &autoscaling.Scale{}
257264
}
258265

266+
// Get retrieves object from Scale storage.
259267
func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
260268
obj, err := r.store.Get(ctx, name, options)
261269
if err != nil {
@@ -269,6 +277,7 @@ func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOpt
269277
return scale, nil
270278
}
271279

280+
// Update alters scale subset of Deployment object.
272281
func (r *ScaleREST) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
273282
obj, err := r.store.Get(ctx, name, &metav1.GetOptions{})
274283
if err != nil {

‎pkg/registry/apps/replicaset/storage/storage.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ type ReplicaSetStorage struct {
4949
Scale *ScaleREST
5050
}
5151

52+
// NewStorage returns new instance of ReplicaSetStorage.
5253
func NewStorage(optsGetter generic.RESTOptionsGetter) (ReplicaSetStorage, error) {
5354
replicaSetRest, replicaSetStatusRest, err := NewREST(optsGetter)
5455
if err != nil {
@@ -62,6 +63,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter) (ReplicaSetStorage, error)
6263
}, nil
6364
}
6465

66+
// REST implements a RESTStorage for ReplicaSet.
6567
type REST struct {
6668
*genericregistry.Store
6769
categories []string
@@ -108,6 +110,7 @@ func (r *REST) Categories() []string {
108110
return r.categories
109111
}
110112

113+
// WithCategories sets categories for REST.
111114
func (r *REST) WithCategories(categories []string) *REST {
112115
r.categories = categories
113116
return r
@@ -118,6 +121,7 @@ type StatusREST struct {
118121
store *genericregistry.Store
119122
}
120123

124+
// New returns empty ReplicaSet object.
121125
func (r *StatusREST) New() runtime.Object {
122126
return &apps.ReplicaSet{}
123127
}
@@ -134,6 +138,7 @@ func (r *StatusREST) Update(ctx context.Context, name string, objInfo rest.Updat
134138
return r.store.Update(ctx, name, objInfo, createValidation, updateValidation, false, options)
135139
}
136140

141+
// ScaleREST implements a Scale for Deployment.
137142
type ScaleREST struct {
138143
store *genericregistry.Store
139144
}
@@ -142,6 +147,7 @@ type ScaleREST struct {
142147
var _ = rest.Patcher(&ScaleREST{})
143148
var _ = rest.GroupVersionKindProvider(&ScaleREST{})
144149

150+
// GroupVersionKind returns GroupVersionKind for ReplicaSet Scale object
145151
func (r *ScaleREST) GroupVersionKind(containingGV schema.GroupVersion) schema.GroupVersionKind {
146152
switch containingGV {
147153
case extensionsv1beta1.SchemeGroupVersion:
@@ -160,6 +166,7 @@ func (r *ScaleREST) New() runtime.Object {
160166
return &autoscaling.Scale{}
161167
}
162168

169+
// Get retrieves object from Scale storage.
163170
func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
164171
obj, err := r.store.Get(ctx, name, options)
165172
if err != nil {
@@ -173,6 +180,7 @@ func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOpt
173180
return scale, err
174181
}
175182

183+
// Update alters scale subset of ReplicaSet object.
176184
func (r *ScaleREST) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
177185
obj, err := r.store.Get(ctx, name, &metav1.GetOptions{})
178186
if err != nil {

‎pkg/registry/apps/rest/storage_apps.go‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,27 @@ import (
3131
statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage"
3232
)
3333

34-
type RESTStorageProvider struct{}
34+
// StorageProvider is a struct for apps REST storage.
35+
type StorageProvider struct{}
3536

36-
func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (genericapiserver.APIGroupInfo, bool, error) {
37+
// NewRESTStorage returns APIGroupInfo object.
38+
func (p StorageProvider) NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (genericapiserver.APIGroupInfo, bool, error) {
3739
apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(apps.GroupName, legacyscheme.Scheme, legacyscheme.ParameterCodec, legacyscheme.Codecs)
3840
// If you add a version here, be sure to add an entry in `k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go with specific priorities.
3941
// TODO refactor the plumbing to provide the information in the APIGroupInfo
4042

4143
if apiResourceConfigSource.VersionEnabled(appsapiv1.SchemeGroupVersion) {
42-
if storageMap, err := p.v1Storage(apiResourceConfigSource, restOptionsGetter); err != nil {
44+
storageMap, err := p.v1Storage(apiResourceConfigSource, restOptionsGetter)
45+
if err != nil {
4346
return genericapiserver.APIGroupInfo{}, false, err
44-
} else {
45-
apiGroupInfo.VersionedResourcesStorageMap[appsapiv1.SchemeGroupVersion.Version] = storageMap
4647
}
48+
apiGroupInfo.VersionedResourcesStorageMap[appsapiv1.SchemeGroupVersion.Version] = storageMap
4749
}
4850

4951
return apiGroupInfo, true, nil
5052
}
5153

52-
func (p RESTStorageProvider) v1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) {
54+
func (p StorageProvider) v1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) {
5355
storage := map[string]rest.Storage{}
5456

5557
// deployments
@@ -97,6 +99,7 @@ func (p RESTStorageProvider) v1Storage(apiResourceConfigSource serverstorage.API
9799
return storage, nil
98100
}
99101

100-
func (p RESTStorageProvider) GroupName() string {
102+
// GroupName returns name of the group
103+
func (p StorageProvider) GroupName() string {
101104
return apps.GroupName
102105
}

‎pkg/registry/apps/statefulset/storage/storage.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ type StatefulSetStorage struct {
4646
Scale *ScaleREST
4747
}
4848

49+
// NewStorage returns new instance of StatefulSetStorage.
4950
func NewStorage(optsGetter generic.RESTOptionsGetter) (StatefulSetStorage, error) {
5051
statefulSetRest, statefulSetStatusRest, err := NewREST(optsGetter)
5152
if err != nil {
@@ -59,7 +60,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter) (StatefulSetStorage, error
5960
}, nil
6061
}
6162

62-
// rest implements a RESTStorage for statefulsets against etcd
63+
// REST implements a RESTStorage for statefulsets against etcd
6364
type REST struct {
6465
*genericregistry.Store
6566
}
@@ -100,6 +101,7 @@ type StatusREST struct {
100101
store *genericregistry.Store
101102
}
102103

104+
// New returns empty StatefulSet object.
103105
func (r *StatusREST) New() runtime.Object {
104106
return &apps.StatefulSet{}
105107
}
@@ -124,6 +126,7 @@ func (r *REST) ShortNames() []string {
124126
return []string{"sts"}
125127
}
126128

129+
// ScaleREST implements a Scale for Deployment.
127130
type ScaleREST struct {
128131
store *genericregistry.Store
129132
}
@@ -132,6 +135,7 @@ type ScaleREST struct {
132135
var _ = rest.Patcher(&ScaleREST{})
133136
var _ = rest.GroupVersionKindProvider(&ScaleREST{})
134137

138+
// GroupVersionKind returns GroupVersionKind for StatefulSet Scale object
135139
func (r *ScaleREST) GroupVersionKind(containingGV schema.GroupVersion) schema.GroupVersionKind {
136140
switch containingGV {
137141
case appsv1beta1.SchemeGroupVersion:
@@ -148,6 +152,7 @@ func (r *ScaleREST) New() runtime.Object {
148152
return &autoscaling.Scale{}
149153
}
150154

155+
// Get retrieves object from Scale storage.
151156
func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
152157
obj, err := r.store.Get(ctx, name, options)
153158
if err != nil {
@@ -161,6 +166,7 @@ func (r *ScaleREST) Get(ctx context.Context, name string, options *metav1.GetOpt
161166
return scale, err
162167
}
163168

169+
// Update alters scale subset of StatefulSet object.
164170
func (r *ScaleREST) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
165171
obj, err := r.store.Get(ctx, name, &metav1.GetOptions{})
166172
if err != nil {

0 commit comments

Comments
 (0)