github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Use correct singular name format for subresources

Browse Source
This commit is contained in:
Arda Güçlü
2022-11-04 16:05:45 +03:00
parent 578ddde80e
commit 672e0b1e01
32 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/core/namespace/storage/storage.go
View File

@@ -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"
}

2
pkg/registry/core/node/rest/proxy.go
View File

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

2
pkg/registry/core/node/storage/storage.go
View File

@@ -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.

2
pkg/registry/core/persistentvolume/storage/storage.go
View File

@@ -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"
}

2
pkg/registry/core/persistentvolumeclaim/storage/storage.go
View File

@@ -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"
}

2
pkg/registry/core/pod/rest/log.go
View File

@@ -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"
}

8
pkg/registry/core/pod/rest/subresources.go
View File

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

2
pkg/registry/core/pod/storage/eviction.go
View File

@@ -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.

8
pkg/registry/core/pod/storage/storage.go
View File

@@ -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"
}

4
pkg/registry/core/replicationcontroller/storage/storage.go
View File

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

2
pkg/registry/core/resourcequota/storage/storage.go
View File

@@ -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"
}

2
pkg/registry/core/service/proxy.go
View File

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

2
pkg/registry/core/service/storage/storage.go
View File

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

2
pkg/registry/core/serviceaccount/storage/token.go
View File

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