Skip to content

Commit

Permalink
Merge pull request kubernetes#61452 from hzxuzhonghu/minor-revision
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 61452, 61727, 61462, 61692, 61738). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove invalid resource replicationControllers in DefaultResourcePrefixes

As all resources are lowercased, so remove invalid GroupResource `{Group: "", Resource: "replicationControllers"}`.

**Release note**:

```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue authored Mar 27, 2018
2 parents 90c09c7 + 5ac83d3 commit 5ed6d9f
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pkg/kubeapiserver/default_storage_factory_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (

// SpecialDefaultResourcePrefixes are prefixes compiled into Kubernetes.
var SpecialDefaultResourcePrefixes = map[schema.GroupResource]string{
{Group: "", Resource: "replicationControllers"}: "controllers",
{Group: "", Resource: "replicationcontrollers"}: "controllers",
{Group: "", Resource: "endpoints"}: "services/endpoints",
{Group: "", Resource: "nodes"}: "minions",
Expand Down

0 comments on commit 5ed6d9f

Please sign in to comment.