From 90c49ab2eda2f786d143117f6f2133f1fa90af34 Mon Sep 17 00:00:00 2001 From: Abhijit Hoskeri Date: Sat, 18 May 2024 12:47:42 -0700 Subject: [PATCH] Remove unused field from APIGroupVersion RootScopedKinds is only present in unit tests, and is not referenced anywhere else. --- staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go | 2 -- staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go | 4 ---- 2 files changed, 6 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index 04a28e7fa6b..903d537a383 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -237,7 +237,6 @@ func handleInternal(storage map[string]rest.Storage, admissionControl admission. Defaulter: scheme, Typer: scheme, Namer: namer, - RootScopedKinds: sets.NewString("SimpleRoot"), EquivalentResourceRegistry: runtime.NewEquivalentResourceRegistry(), @@ -3311,7 +3310,6 @@ func TestParentResourceIsRequired(t *testing.T) { Defaulter: scheme, Typer: scheme, Namer: namer, - RootScopedKinds: sets.NewString("SimpleRoot"), EquivalentResourceRegistry: runtime.NewEquivalentResourceRegistry(), diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go b/staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go index a60485d20c1..612b1a014f1 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/groupversion.go @@ -28,7 +28,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/managedfields" - "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/discovery" @@ -71,9 +70,6 @@ type APIGroupVersion struct { // version (for when the inevitable meta/v2 group emerges). MetaGroupVersion *schema.GroupVersion - // RootScopedKinds are the root scoped kinds for the primary GroupVersion - RootScopedKinds sets.String - // Serializer is used to determine how to convert responses from API methods into bytes to send over // the wire. Serializer runtime.NegotiatedSerializer