From ca82ee6238a584bd688fe03687d45d47412c6c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Fri, 18 Nov 2022 09:55:18 +0300 Subject: [PATCH] Remove GetSingularName for subresources Kubernetes-commit: 1abf94bec30706afbbeae7e4a1cbf4dbacbaa422 --- pkg/endpoints/installer.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/endpoints/installer.go b/pkg/endpoints/installer.go index 63d217062..2c4d7b957 100644 --- a/pkg/endpoints/installer.go +++ b/pkg/endpoints/installer.go @@ -1080,11 +1080,13 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag if categoriesProvider, ok := storage.(rest.CategoriesProvider); ok { apiResource.Categories = categoriesProvider.Categories() } - singularNameProvider, ok := storage.(rest.SingularNameProvider) - if !ok { - return nil, nil, fmt.Errorf("resource %s must implement SingularNameProvider", resource) + if !isSubresource { + singularNameProvider, ok := storage.(rest.SingularNameProvider) + if !ok { + return nil, nil, fmt.Errorf("resource %s must implement SingularNameProvider", resource) + } + apiResource.SingularName = singularNameProvider.GetSingularName() } - apiResource.SingularName = singularNameProvider.GetSingularName() if gvkProvider, ok := storage.(rest.GroupVersionKindProvider); ok { gvk := gvkProvider.GroupVersionKind(a.group.GroupVersion)