diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index 2606e540d67..8d5201d1a75 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -18,7 +18,6 @@ package rest import ( storageapiv1 "k8s.io/api/storage/v1" - storageapiv1alpha1 "k8s.io/api/storage/v1alpha1" storageapiv1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/rest" @@ -42,11 +41,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag // If you add a version here, be sure to add an entry in `k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go with specific priorities. // TODO refactor the plumbing to provide the information in the APIGroupInfo - if storageMap, err := p.v1alpha1Storage(apiResourceConfigSource, restOptionsGetter); err != nil { - return genericapiserver.APIGroupInfo{}, err - } else if len(storageMap) > 0 { - apiGroupInfo.VersionedResourcesStorageMap[storageapiv1alpha1.SchemeGroupVersion.Version] = storageMap - } if storageMap, err := p.v1beta1Storage(apiResourceConfigSource, restOptionsGetter); err != nil { return genericapiserver.APIGroupInfo{}, err } else if len(storageMap) > 0 { @@ -61,21 +55,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag return apiGroupInfo, nil } -func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) { - storage := map[string]rest.Storage{} - - // register volumeattributesclasses - if resource := "volumeattributesclasses"; apiResourceConfigSource.ResourceEnabled(storageapiv1alpha1.SchemeGroupVersion.WithResource(resource)) { - volumeAttributesClassStorage, err := volumeattributesclassstore.NewREST(restOptionsGetter) - if err != nil { - return storage, err - } - storage[resource] = volumeAttributesClassStorage - } - - return storage, nil -} - func (p RESTStorageProvider) v1beta1Storage(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 7727429765c..205fb50ae45 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -377,16 +377,6 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, isEmulat }, // -- - // k8s.io/kubernetes/pkg/apis/storage/v1alpha1 - gvr("storage.k8s.io", "v1alpha1", "volumeattributesclasses"): { - Stub: `{"metadata": {"name": "vac1"}, "driverName": "example.com/driver", "parameters": {"foo": "bar"}}`, - ExpectedEtcdPath: "/registry/volumeattributesclasses/vac1", - ExpectedGVK: gvkP("storage.k8s.io", "v1beta1", "VolumeAttributesClass"), - IntroducedVersion: "1.29", - RemovedVersion: "1.35", - }, - // -- - // k8s.io/kubernetes/pkg/apis/storage/v1beta1 gvr("storage.k8s.io", "v1beta1", "volumeattributesclasses"): { Stub: `{"metadata": {"name": "vac2"}, "driverName": "example.com/driver", "parameters": {"foo": "bar"}}`,