diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index 05a585fe995..aaa27854477 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -46,7 +46,6 @@ import ( networkingapiv1 "k8s.io/api/networking/v1" networkingapiv1alpha1 "k8s.io/api/networking/v1alpha1" nodev1 "k8s.io/api/node/v1" - nodev1beta1 "k8s.io/api/node/v1beta1" policyapiv1 "k8s.io/api/policy/v1" policyapiv1beta1 "k8s.io/api/policy/v1beta1" rbacv1 "k8s.io/api/rbac/v1" @@ -711,7 +710,6 @@ var ( // betaAPIGroupVersionsDisabledByDefault is for all future beta groupVersions. betaAPIGroupVersionsDisabledByDefault = []schema.GroupVersion{ authenticationv1beta1.SchemeGroupVersion, - nodev1beta1.SchemeGroupVersion, // remove in 1.26 policyapiv1beta1.SchemeGroupVersion, storageapiv1beta1.SchemeGroupVersion, flowcontrolv1beta1.SchemeGroupVersion, diff --git a/pkg/registry/node/rest/runtime_class.go b/pkg/registry/node/rest/runtime_class.go index 0252d1d0f91..f56ab236ea6 100644 --- a/pkg/registry/node/rest/runtime_class.go +++ b/pkg/registry/node/rest/runtime_class.go @@ -18,7 +18,6 @@ package rest import ( nodev1 "k8s.io/api/node/v1" - nodev1beta1 "k8s.io/api/node/v1beta1" "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/rest" genericapiserver "k8s.io/apiserver/pkg/server" @@ -35,13 +34,6 @@ type RESTStorageProvider struct{} func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (genericapiserver.APIGroupInfo, error) { apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(nodeinternal.GroupName, legacyscheme.Scheme, legacyscheme.ParameterCodec, legacyscheme.Codecs) - if storageMap, err := p.v1beta1Storage(apiResourceConfigSource, restOptionsGetter); err != nil { - // remove in 1.26 - return genericapiserver.APIGroupInfo{}, err - } else if len(storageMap) > 0 { - apiGroupInfo.VersionedResourcesStorageMap[nodev1beta1.SchemeGroupVersion.Version] = storageMap - } - if storageMap, err := p.v1Storage(apiResourceConfigSource, restOptionsGetter); err != nil { return genericapiserver.APIGroupInfo{}, err } else if len(storageMap) > 0 { @@ -51,20 +43,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag return apiGroupInfo, nil } -func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) { - storage := map[string]rest.Storage{} - - if resource := "runtimeclasses"; apiResourceConfigSource.ResourceEnabled(nodev1beta1.SchemeGroupVersion.WithResource(resource)) { - s, err := runtimeclassstorage.NewREST(restOptionsGetter) - if err != nil { - return storage, err - } - storage[resource] = s - } - - return storage, nil -} - func (p RESTStorageProvider) v1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) { storage := map[string]rest.Storage{} diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index cf6962e9381..c4d2cae7587 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -416,14 +416,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes }, // -- - // k8s.io/kubernetes/pkg/apis/node/v1beta1 - gvr("node.k8s.io", "v1beta1", "runtimeclasses"): { - Stub: `{"metadata": {"name": "rc2"}, "handler": "h2"}`, - ExpectedEtcdPath: "/registry/runtimeclasses/rc2", - ExpectedGVK: gvkP("node.k8s.io", "v1", "RuntimeClass"), - }, - // -- - // k8s.io/kubernetes/pkg/apis/node/v1 gvr("node.k8s.io", "v1", "runtimeclasses"): { Stub: `{"metadata": {"name": "rc3"}, "handler": "h3"}`,