Use correct singular name format for subresources

pkg/registry/apiserverinternal/storageversion/storage/storage.go

@@ -104,5 +104,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/apps/daemonset/storage/storage.go

@@ -119,5 +119,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

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

@@ -171,7 +171,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 // RollbackREST implements the REST endpoint for initiating the rollback of a deployment
@@ -207,7 +207,7 @@ func (r *RollbackREST) Destroy() {
 var _ rest.SingularNameProvider = &RollbackREST{}
 
 func (r *RollbackREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/rollback"
 }
 
 var _ = rest.NamedCreater(&RollbackREST{})
@@ -357,7 +357,7 @@ func (r *ScaleREST) ConvertToTable(ctx context.Context, object runtime.Object, t
 var _ rest.SingularNameProvider = &ScaleREST{}
 
 func (r *ScaleREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/scale"
 }
 
 func toScaleCreateValidation(f rest.ValidateObjectFunc) rest.ValidateObjectFunc {

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

@@ -167,7 +167,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 // ScaleREST implements a Scale for ReplicaSet.
@@ -247,7 +247,7 @@ func (r *ScaleREST) ConvertToTable(ctx context.Context, object runtime.Object, t
 var _ rest.SingularNameProvider = &ScaleREST{}
 
 func (r *ScaleREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/scale"
 }
 
 func toScaleCreateValidation(f rest.ValidateObjectFunc) rest.ValidateObjectFunc {

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

@@ -155,7 +155,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 // Implement ShortNamesProvider
@@ -241,7 +241,7 @@ func (r *ScaleREST) ConvertToTable(ctx context.Context, object runtime.Object, t
 var _ rest.SingularNameProvider = &ScaleREST{}
 
 func (r *ScaleREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/scale"
 }
 
 func toScaleCreateValidation(f rest.ValidateObjectFunc) rest.ValidateObjectFunc {

pkg/registry/authentication/selfsubjectreview/rest.go

@@ -93,3 +93,7 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 
 	return selfSAR, nil
 }
+
+func (r *REST) GetSingularName() string {
+	return "selfsubjectrulesreview"
+}

pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go

@@ -119,5 +119,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/batch/cronjob/storage/storage.go

@@ -117,5 +117,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/batch/job/storage/storage.go

@@ -160,5 +160,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/certificates/certificates/storage/storage.go

@@ -120,7 +120,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 var _ = rest.Patcher(&StatusREST{})
@@ -161,7 +161,7 @@ func (r *ApprovalREST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set
 var _ rest.SingularNameProvider = &ApprovalREST{}
 
 func (r *ApprovalREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/approval"
 }
 
 var _ = rest.Patcher(&ApprovalREST{})

pkg/registry/core/namespace/storage/storage.go

@@ -342,7 +342,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 func (r *FinalizeREST) New() runtime.Object {
@@ -370,5 +370,5 @@ func (r *FinalizeREST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set
 var _ rest.SingularNameProvider = &FinalizeREST{}
 
 func (r *FinalizeREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/finalize"
 }

pkg/registry/core/node/rest/proxy.go

@@ -69,7 +69,7 @@ func (r *ProxyREST) NewConnectOptions() (runtime.Object, bool, string) {
 var _ rest.SingularNameProvider = &ProxyREST{}
 
 func (r *ProxyREST) GetSingularName() string {
-	return r.Store.GetSingularName()
+	return r.Store.GetSingularName() + "/proxy"
 }
 
 // Connect returns a handler for the node proxy

pkg/registry/core/node/storage/storage.go

@@ -96,7 +96,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 // NewStorage returns a NodeStorage object that will work against nodes.

pkg/registry/core/persistentvolume/storage/storage.go

@@ -114,5 +114,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/core/persistentvolumeclaim/storage/storage.go

@@ -158,5 +158,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/core/pod/rest/log.go

@@ -137,5 +137,5 @@ func (r *LogREST) OverrideMetricsVerb(oldVerb string) (newVerb string) {
 var _ rest.SingularNameProvider = &LogREST{}
 
 func (r *LogREST) GetSingularName() string {
-	return r.Store.GetSingularName()
+	return r.Store.GetSingularName() + "/log"
 }

pkg/registry/core/pod/rest/subresources.go

@@ -83,7 +83,7 @@ func (r *ProxyREST) Connect(ctx context.Context, id string, opts runtime.Object,
 var _ rest.SingularNameProvider = &ProxyREST{}
 
 func (r *ProxyREST) GetSingularName() string {
-	return r.Store.GetSingularName()
+	return r.Store.GetSingularName() + "/proxy"
 }
 
 // Support both GET and POST methods. We must support GET for browsers that want to use WebSockets.
@@ -135,7 +135,7 @@ func (r *AttachREST) ConnectMethods() []string {
 var _ rest.SingularNameProvider = &AttachREST{}
 
 func (r *AttachREST) GetSingularName() string {
-	return r.Store.GetSingularName()
+	return r.Store.GetSingularName() + "/attach"
 }
 
 // ExecREST implements the exec subresource for a Pod
@@ -184,7 +184,7 @@ func (r *ExecREST) ConnectMethods() []string {
 var _ rest.SingularNameProvider = &ExecREST{}
 
 func (r *ExecREST) GetSingularName() string {
-	return r.Store.GetSingularName()
+	return r.Store.GetSingularName() + "/exec"
 }
 
 // PortForwardREST implements the portforward subresource for a Pod
@@ -234,7 +234,7 @@ func (r *PortForwardREST) Connect(ctx context.Context, name string, opts runtime
 var _ rest.SingularNameProvider = &PortForwardREST{}
 
 func (r *PortForwardREST) GetSingularName() string {
-	return r.Store.GetSingularName()
+	return r.Store.GetSingularName() + "/portforward"
 }
 
 func newThrottledUpgradeAwareProxyHandler(location *url.URL, transport http.RoundTripper, wrapTransport, upgradeRequired bool, responder rest.Responder) *proxy.UpgradeAwareHandler {

pkg/registry/core/pod/storage/eviction.go

@@ -106,7 +106,7 @@ func (r *EvictionREST) Destroy() {
 var _ rest.SingularNameProvider = &EvictionREST{}
 
 func (r *EvictionREST) GetSingularName() string {
-	return "pod"
+	return "pod/eviction"
 }
 
 // Propagate dry-run takes the dry-run option from the request and pushes it into the eviction object.

pkg/registry/core/pod/storage/storage.go

@@ -167,7 +167,7 @@ func (r *BindingREST) Destroy() {
 var _ rest.SingularNameProvider = &BindingREST{}
 
 func (r *BindingREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/binding"
 }
 
 var _ = rest.NamedCreater(&BindingREST{})
@@ -289,7 +289,7 @@ func (r *LegacyBindingREST) Destroy() {
 var _ rest.SingularNameProvider = &LegacyBindingREST{}
 
 func (r *LegacyBindingREST) GetSingularName() string {
-	return r.bindingRest.GetSingularName()
+	return r.bindingRest.GetSingularName() + "/binding"
 }
 
 // Create ensures a pod is bound to a specific host.
@@ -341,7 +341,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 // EphemeralContainersREST implements the REST endpoint for adding EphemeralContainers
@@ -377,5 +377,5 @@ func (r *EphemeralContainersREST) Update(ctx context.Context, name string, objIn
 var _ rest.SingularNameProvider = &EphemeralContainersREST{}
 
 func (r *EphemeralContainersREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/ephemeralcontainers"
 }

pkg/registry/core/replicationcontroller/storage/storage.go

@@ -162,7 +162,7 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 type ScaleREST struct {
@@ -226,7 +226,7 @@ func (r *ScaleREST) ConvertToTable(ctx context.Context, object runtime.Object, t
 var _ rest.SingularNameProvider = &ScaleREST{}
 
 func (r *ScaleREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/scale"
 }
 
 func toScaleCreateValidation(f rest.ValidateObjectFunc) rest.ValidateObjectFunc {

pkg/registry/core/resourcequota/storage/storage.go

@@ -113,5 +113,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/core/service/proxy.go

@@ -80,7 +80,7 @@ func (r *ProxyREST) Connect(ctx context.Context, id string, opts runtime.Object,
 var _ rest.SingularNameProvider = &ProxyREST{}
 
 func (r *ProxyREST) GetSingularName() string {
-	return "service"
+	return "service/proxy"
 }
 
 func newThrottledUpgradeAwareProxyHandler(location *url.URL, transport http.RoundTripper, wrapTransport, upgradeRequired bool, responder rest.Responder) *proxy.UpgradeAwareHandler {

pkg/registry/core/service/storage/storage.go

@@ -199,7 +199,7 @@ func (r *StatusREST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }
 
 // We have a lot of functions that take a pair of "before" and "after" or

pkg/registry/core/serviceaccount/storage/token.go

@@ -52,7 +52,7 @@ func (r *TokenREST) Destroy() {
 var _ rest.SingularNameProvider = &TokenREST{}
 
 func (r *TokenREST) GetSingularName() string {
-	return "serviceaccount"
+	return "serviceaccount/token"
 }
 
 type TokenREST struct {

pkg/registry/flowcontrol/flowschema/storage/storage.go

@@ -112,5 +112,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/flowcontrol/prioritylevelconfiguration/storage/storage.go

@@ -112,5 +112,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/networking/ingress/storage/storage.go

@@ -111,5 +111,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/networking/networkpolicy/storage/storage.go

@@ -109,5 +109,5 @@ func (r *StatusREST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/policy/poddisruptionbudget/storage/storage.go

@@ -108,5 +108,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

pkg/registry/storage/volumeattachment/storage/storage.go

@@ -116,5 +116,5 @@ func (r *StatusREST) ConvertToTable(ctx context.Context, object runtime.Object,
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go

@@ -222,5 +222,5 @@ func (r *StatusREST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
 var _ rest.SingularNameProvider = &StatusREST{}
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }

staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go

@@ -172,5 +172,5 @@ func (r *StatusREST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
 }
 
 func (r *StatusREST) GetSingularName() string {
-	return r.store.GetSingularName()
+	return r.store.GetSingularName() + "/status"
 }