github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-22 01:56:16 +00:00
Code Issues Projects Releases Wiki Activity

Svc REST: Remove old, now unused stubs

Browse Source
This commit is contained in:
Tim Hockin 2020-12-05 16:42:47 -08:00
parent 8e68b587e8
commit 03e7690cdb
2 changed files with 8 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
pkg/registry/core/service/storage/rest.go
View File

@ -19,16 +19,11 @@ package storage
import ( import (
"context" "context"
"fmt" "fmt"
"net/http"
"net/url"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/watch"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request" genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
@ -40,16 +35,8 @@ import (
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator"
netutils "k8s.io/utils/net" netutils "k8s.io/utils/net"
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
) )
// REST adapts a service registry into apiserver's RESTStorage model.
type REST struct {
services ServiceStorage
proxyTransport http.RoundTripper
pods rest.Getter
}
// RESTAllocStuff is a temporary struct to facilitate the flattening of service // RESTAllocStuff is a temporary struct to facilitate the flattening of service
// REST layers. It will be cleaned up over a series of commits. // REST layers. It will be cleaned up over a series of commits.
type RESTAllocStuff struct { type RESTAllocStuff struct {
@ -68,18 +55,6 @@ type ServiceNodePort struct {
NodePort int32 NodePort int32
} }
type ServiceStorage interface {
rest.Scoper
rest.Getter
rest.Lister
rest.CreaterUpdater
rest.GracefulDeleter
rest.Watcher
rest.StorageVersionProvider
rest.ResetFieldsStrategy
rest.Redirector
}
// This is a trasitionary function to facilitate service REST flattening. // This is a trasitionary function to facilitate service REST flattening.
func makeAlloc(defaultFamily api.IPFamily, ipAllocs map[api.IPFamily]ipallocator.Interface, portAlloc portallocator.Interface) RESTAllocStuff { func makeAlloc(defaultFamily api.IPFamily, ipAllocs map[api.IPFamily]ipallocator.Interface, portAlloc portallocator.Interface) RESTAllocStuff {
return RESTAllocStuff{ return RESTAllocStuff{
@ -89,55 +64,6 @@ func makeAlloc(defaultFamily api.IPFamily, ipAllocs map[api.IPFamily]ipallocator
} }
} }
var (
_ ServiceStorage = &REST{}
_ rest.CategoriesProvider = &REST{}
_ rest.ShortNamesProvider = &REST{}
_ rest.StorageVersionProvider = &REST{}
)
func (rs *REST) StorageVersion() runtime.GroupVersioner {
return rs.services.StorageVersion()
}
// ShortNames implements the ShortNamesProvider interface. Returns a list of short names for a resource.
func (rs *REST) ShortNames() []string {
return []string{"svc"}
}
// Categories implements the CategoriesProvider interface. Returns a list of categories a resource is part of.
func (rs *REST) Categories() []string {
return []string{"all"}
}
func (rs *REST) NamespaceScoped() bool {
return rs.services.NamespaceScoped()
}
func (rs *REST) New() runtime.Object {
return rs.services.New()
}
func (rs *REST) NewList() runtime.Object {
return rs.services.NewList()
}
func (rs *REST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) {
return rs.services.Get(ctx, name, options)
}
func (rs *REST) List(ctx context.Context, options *metainternalversion.ListOptions) (runtime.Object, error) {
return rs.services.List(ctx, options)
}
func (rs *REST) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
return rs.services.Watch(ctx, options)
}
func (rs *REST) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, options *metav1.CreateOptions) (runtime.Object, error) {
return rs.services.Create(ctx, obj, createValidation, options)
}
func (al *RESTAllocStuff) allocateCreate(service *api.Service, dryRun bool) (transaction, error) { func (al *RESTAllocStuff) allocateCreate(service *api.Service, dryRun bool) (transaction, error) {
result := metaTransaction{} result := metaTransaction{}
@ -169,10 +95,6 @@ func (al *RESTAllocStuff) allocateCreate(service *api.Service, dryRun bool) (tra
return result, nil return result, nil
} }
func (rs *REST) Delete(ctx context.Context, id string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
return rs.services.Delete(ctx, id, deleteValidation, options)
}
func (al *RESTAllocStuff) releaseAllocatedResources(svc *api.Service) { func (al *RESTAllocStuff) releaseAllocatedResources(svc *api.Service) {
al.releaseServiceClusterIPs(svc) al.releaseServiceClusterIPs(svc)
@ -237,10 +159,6 @@ func (al *RESTAllocStuff) healthCheckNodePortUpdate(oldService, service *api.Ser
return true, nil return true, nil
} }
func (rs *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObjectInfo, createValidation rest.ValidateObjectFunc, updateValidation rest.ValidateObjectUpdateFunc, forceAllowCreate bool, options *metav1.UpdateOptions) (runtime.Object, bool, error) {
return rs.services.Update(ctx, name, objInfo, createValidation, updateValidation, forceAllowCreate, options)
}
func (al *RESTAllocStuff) allocateUpdate(service, oldService *api.Service, dryRun bool) (transaction, error) { func (al *RESTAllocStuff) allocateUpdate(service, oldService *api.Service, dryRun bool) (transaction, error) {
result := metaTransaction{} result := metaTransaction{}
@ -314,23 +232,6 @@ func (al *RESTAllocStuff) allocUpdateServiceNodePortsNew(service, oldService *ap
return txn, nil return txn, nil
} }
// GetResetFields implements rest.ResetFieldsStrategy
func (rs *REST) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
return rs.services.GetResetFields()
}
// Implement Redirector.
var _ = rest.Redirector(&REST{})
// ResourceLocation returns a URL to which one can send traffic for the specified service.
func (rs *REST) ResourceLocation(ctx context.Context, id string) (*url.URL, http.RoundTripper, error) {
return rs.services.ResourceLocation(ctx, id)
}
func (r *REST) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
return r.services.ConvertToTable(ctx, object, tableOptions)
}
func (al *RESTAllocStuff) allocClusterIPs(service *api.Service, toAlloc map[api.IPFamily]string, dryRun bool) (map[api.IPFamily]string, error) { func (al *RESTAllocStuff) allocClusterIPs(service *api.Service, toAlloc map[api.IPFamily]string, dryRun bool) (map[api.IPFamily]string, error) {
allocated := make(map[api.IPFamily]string) allocated := make(map[api.IPFamily]string)

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

@ -70,6 +70,14 @@ type GenericREST struct {
proxyTransport http.RoundTripper proxyTransport http.RoundTripper
} }
var (
_ rest.CategoriesProvider = &GenericREST{}
_ rest.ShortNamesProvider = &GenericREST{}
_ rest.StorageVersionProvider = &GenericREST{}
_ rest.ResetFieldsStrategy = &GenericREST{}
_ rest.Redirector = &GenericREST{}
)
// NewGenericREST returns a RESTStorage object that will work against services. // NewGenericREST returns a RESTStorage object that will work against services.
func NewGenericREST( func NewGenericREST(
optsGetter generic.RESTOptionsGetter, optsGetter generic.RESTOptionsGetter,
@ -371,9 +379,6 @@ func (r *GenericREST) beginUpdate(ctx context.Context, obj, oldObj runtime.Objec
return finish, nil return finish, nil
} }
// Implement Redirector.
var _ rest.Redirector = &GenericREST{}
// ResourceLocation returns a URL to which one can send traffic for the specified service. // ResourceLocation returns a URL to which one can send traffic for the specified service.
func (r *GenericREST) ResourceLocation(ctx context.Context, id string) (*url.URL, http.RoundTripper, error) { func (r *GenericREST) ResourceLocation(ctx context.Context, id string) (*url.URL, http.RoundTripper, error) {
// Allow ID as "svcname", "svcname:port", or "scheme:svcname:port". // Allow ID as "svcname", "svcname:port", or "scheme:svcname:port".