From 1186e25a45256b4118b7895ed7bb9377dd80a775 Mon Sep 17 00:00:00 2001 From: carlory Date: Tue, 31 Oct 2023 14:50:31 +0800 Subject: [PATCH] Remove ability to re-enable serving deprecated storagev1beta1 and storagev1alpha1 APIs Co-authored-by: Jordan Liggitt --- pkg/registry/storage/rest/storage_storage.go | 18 ------------------ test/integration/etcd/data.go | 16 ---------------- test/integration/metrics/metrics_test.go | 4 ++-- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index 30af516bd7c..7bb84b21e46 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -64,15 +64,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) { storage := map[string]rest.Storage{} - // register csistoragecapacities - if resource := "csistoragecapacities"; apiResourceConfigSource.ResourceEnabled(storageapiv1alpha1.SchemeGroupVersion.WithResource(resource)) { - csiStorageStorage, err := csistoragecapacitystore.NewStorage(restOptionsGetter) - if err != nil { - return storage, err - } - storage[resource] = csiStorageStorage.CSIStorageCapacity - } - // register volumeattributesclasses if resource := "volumeattributesclasses"; apiResourceConfigSource.ResourceEnabled(storageapiv1alpha1.SchemeGroupVersion.WithResource(resource)) { volumeAttributesClassStorage, err := volumeattributesclassstore.NewREST(restOptionsGetter) @@ -88,15 +79,6 @@ func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource serverstora func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) (map[string]rest.Storage, error) { storage := map[string]rest.Storage{} - // register csistoragecapacities - if resource := "csistoragecapacities"; apiResourceConfigSource.ResourceEnabled(storageapiv1beta1.SchemeGroupVersion.WithResource(resource)) { - csiStorageStorage, err := csistoragecapacitystore.NewStorage(restOptionsGetter) - if err != nil { - return storage, err - } - storage[resource] = csiStorageStorage.CSIStorageCapacity - } - return storage, nil } diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index 2212a90db54..794522e83ab 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -217,14 +217,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes }, // -- - // k8s.io/kubernetes/pkg/apis/storage/v1alpha1 - gvr("storage.k8s.io", "v1alpha1", "csistoragecapacities"): { - Stub: `{"metadata": {"name": "csc-12345-1"}, "storageClassName": "sc1"}`, - ExpectedEtcdPath: "/registry/csistoragecapacities/" + namespace + "/csc-12345-1", - ExpectedGVK: gvkP("storage.k8s.io", "v1", "CSIStorageCapacity"), - }, - // -- - // k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1 gvr("flowcontrol.apiserver.k8s.io", "v1beta1", "flowschemas"): { Stub: `{"metadata": {"name": "va2"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`, @@ -301,14 +293,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes }, // -- - // k8s.io/kubernetes/pkg/apis/storage/v1beta1 - gvr("storage.k8s.io", "v1beta1", "csistoragecapacities"): { - Stub: `{"metadata": {"name": "csc-12345-2"}, "storageClassName": "sc1"}`, - ExpectedEtcdPath: "/registry/csistoragecapacities/" + namespace + "/csc-12345-2", - ExpectedGVK: gvkP("storage.k8s.io", "v1", "CSIStorageCapacity"), - }, - // -- - // k8s.io/kubernetes/pkg/apis/storage/v1 gvr("storage.k8s.io", "v1", "storageclasses"): { Stub: `{"metadata": {"name": "sc2"}, "provisioner": "aws"}`, diff --git a/test/integration/metrics/metrics_test.go b/test/integration/metrics/metrics_test.go index 3ce3a16fe15..0b90fc3595a 100644 --- a/test/integration/metrics/metrics_test.go +++ b/test/integration/metrics/metrics_test.go @@ -112,8 +112,8 @@ func TestAPIServerMetrics(t *testing.T) { } // Make a request to a deprecated API to ensure there's at least one data point - if _, err := client.StorageV1beta1().CSIStorageCapacities("default").List(context.TODO(), metav1.ListOptions{}); err != nil { - t.Fatalf("unexpected error getting rbac roles: %v", err) + if _, err := client.FlowcontrolV1beta3().FlowSchemas().List(context.TODO(), metav1.ListOptions{}); err != nil { + t.Fatalf("unexpected error: %v", err) } metrics, err := scrapeMetrics(s)