From 3cf9bc547fcd9d3e93bf7ccdbf989fa7d8c32221 Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 23 Feb 2021 11:13:50 -0500 Subject: [PATCH] Use a versioner to convert an internal type into an external type for beta serving --- pkg/controlplane/instance.go | 2 +- .../apiserver/pkg/server/deleted_kinds.go | 26 +++++++++++++++---- .../pkg/server/deleted_kinds_test.go | 19 ++++++++++++-- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index ed3c4ca5946..631786e050e 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -603,7 +603,7 @@ func (m *Instance) InstallAPIs(apiResourceConfigSource serverstorage.APIResource // Remove resources that serving kinds that are removed. // We do this here so that we don't accidentally serve versions without resources or openapi information that for kinds we don't serve. // This is a spot above the construction of individual storage handlers so that no sig accidentally forgets to check. - resourceExpirationEvaluator.RemoveDeletedKinds(groupName, apiGroupInfo.VersionedResourcesStorageMap) + resourceExpirationEvaluator.RemoveDeletedKinds(groupName, apiGroupInfo.Scheme, apiGroupInfo.VersionedResourcesStorageMap) if len(apiGroupInfo.VersionedResourcesStorageMap) == 0 { klog.V(1).Infof("Removing API group %v because it is time to stop serving it because it has no versions per APILifecycle.", groupName) continue diff --git a/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds.go b/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds.go index 931264a0d15..27a3f5ba2ae 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds.go +++ b/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds.go @@ -21,6 +21,9 @@ import ( "strconv" "strings" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" apimachineryversion "k8s.io/apimachinery/pkg/version" "k8s.io/apiserver/pkg/registry/rest" @@ -45,7 +48,7 @@ type resourceExpirationEvaluator struct { type ResourceExpirationEvaluator interface { // RemoveDeletedKinds inspects the storage map and modifies it in place by removing storage for kinds that have been deleted. // versionedResourcesStorageMap mirrors the field on APIGroupInfo, it's a map from version to resource to the storage. - RemoveDeletedKinds(groupName string, versionedResourcesStorageMap map[string]map[string]rest.Storage) + RemoveDeletedKinds(groupName string, versioner runtime.ObjectVersioner, versionedResourcesStorageMap map[string]map[string]rest.Storage) // ShouldServeForVersion returns true if a particular version cut off is after the current version ShouldServeForVersion(majorRemoved, minorRemoved int) bool } @@ -91,8 +94,21 @@ func NewResourceExpirationEvaluator(currentVersion apimachineryversion.Info) (Re return ret, nil } -func (e *resourceExpirationEvaluator) shouldServe(resourceServingInfo rest.Storage) bool { - versionedPtr := resourceServingInfo.New() +func (e *resourceExpirationEvaluator) shouldServe(gv schema.GroupVersion, versioner runtime.ObjectVersioner, resourceServingInfo rest.Storage) bool { + internalPtr := resourceServingInfo.New() + + target := gv + // honor storage that overrides group version (used for things like scale subresources) + if versionProvider, ok := resourceServingInfo.(rest.GroupVersionKindProvider); ok { + target = versionProvider.GroupVersionKind(target).GroupVersion() + } + + versionedPtr, err := versioner.ConvertToVersion(internalPtr, target) + if err != nil { + utilruntime.HandleError(err) + return false + } + removed, ok := versionedPtr.(removedInterface) if !ok { return true @@ -135,12 +151,12 @@ type removedInterface interface { // removeDeletedKinds inspects the storage map and modifies it in place by removing storage for kinds that have been deleted. // versionedResourcesStorageMap mirrors the field on APIGroupInfo, it's a map from version to resource to the storage. -func (e *resourceExpirationEvaluator) RemoveDeletedKinds(groupName string, versionedResourcesStorageMap map[string]map[string]rest.Storage) { +func (e *resourceExpirationEvaluator) RemoveDeletedKinds(groupName string, versioner runtime.ObjectVersioner, versionedResourcesStorageMap map[string]map[string]rest.Storage) { versionsToRemove := sets.NewString() for apiVersion, versionToResource := range versionedResourcesStorageMap { resourcesToRemove := sets.NewString() for resourceName, resourceServingInfo := range versionToResource { - if !e.shouldServe(resourceServingInfo) { + if !e.shouldServe(schema.GroupVersion{Group: groupName, Version: apiVersion}, versioner, resourceServingInfo) { resourcesToRemove.Insert(resourceName) } } diff --git a/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds_test.go b/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds_test.go index 54ad13a4d3d..8cbcd2f59cb 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/deleted_kinds_test.go @@ -221,13 +221,27 @@ func Test_resourceExpirationEvaluator_shouldServe(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if actual := tt.resourceExpirationEvaluator.shouldServe(tt.restStorage); actual != tt.expected { + gv := schema.GroupVersion{Group: "mygroup", Version: "myversion"} + convertor := &dummyConvertor{} + if actual := tt.resourceExpirationEvaluator.shouldServe(gv, convertor, tt.restStorage); actual != tt.expected { t.Errorf("shouldServe() = %v, want %v", actual, tt.expected) } + if !reflect.DeepEqual(convertor.called, gv) { + t.Errorf("expected converter to be called with %#v, got %#v", gv, convertor.called) + } }) } } +type dummyConvertor struct { + called runtime.GroupVersioner +} + +func (d *dummyConvertor) ConvertToVersion(in runtime.Object, gv runtime.GroupVersioner) (runtime.Object, error) { + d.called = gv + return in, nil +} + func checkErr(t *testing.T, actual error, expected string) { t.Helper() switch { @@ -309,7 +323,8 @@ func Test_removeDeletedKinds(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - tt.resourceExpirationEvaluator.RemoveDeletedKinds("group.name", tt.versionedResourcesStorageMap) + convertor := &dummyConvertor{} + tt.resourceExpirationEvaluator.RemoveDeletedKinds("group.name", convertor, tt.versionedResourcesStorageMap) if !reflect.DeepEqual(tt.expectedStorage, tt.versionedResourcesStorageMap) { t.Fatal(spew.Sdump(tt.versionedResourcesStorageMap)) }