Skip to content

Commit c87dd9c

Browse files
authored
Merge pull request kubernetes#95275 from ProZsolt/golint-pkg-registry-core-replicationcontroller
Fix golint failures in pkg/registry/core/replicationcontroller
2 parents 5bfbb98 + c244e17 commit c87dd9c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ pkg/registry/core/namespace/storage
136136
pkg/registry/core/node
137137
pkg/registry/core/persistentvolume
138138
pkg/registry/core/persistentvolumeclaim
139-
pkg/registry/core/replicationcontroller
140139
pkg/registry/core/replicationcontroller/storage
141140
pkg/registry/core/rest
142141
pkg/registry/core/secret

pkg/registry/core/replicationcontroller/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package controller provides Registry interface and it's RESTStorage
17+
// Package replicationcontroller provides Registry interface and it's RESTStorage
1818
// implementation for storing ReplicationController api objects.
1919
package replicationcontroller // import "k8s.io/kubernetes/pkg/registry/core/replicationcontroller"

pkg/registry/core/replicationcontroller/strategy.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func ControllerToSelectableFields(controller *api.ReplicationController) fields.
170170
func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
171171
rc, ok := obj.(*api.ReplicationController)
172172
if !ok {
173-
return nil, nil, fmt.Errorf("given object is not a replication controller.")
173+
return nil, nil, fmt.Errorf("given object is not a replication controller")
174174
}
175175
return labels.Set(rc.ObjectMeta.Labels), ControllerToSelectableFields(rc), nil
176176
}
@@ -190,6 +190,7 @@ type rcStatusStrategy struct {
190190
rcStrategy
191191
}
192192

193+
// StatusStrategy is the default logic invoked when updating object status.
193194
var StatusStrategy = rcStatusStrategy{Strategy}
194195

195196
func (rcStatusStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {

0 commit comments

Comments
 (0)