mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Use a versioner to convert an internal type into an external type for
beta serving
This commit is contained in:
parent
a6a66c3594
commit
3cf9bc547f
@ -603,7 +603,7 @@ func (m *Instance) InstallAPIs(apiResourceConfigSource serverstorage.APIResource
|
|||||||
// Remove resources that serving kinds that are removed.
|
// 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.
|
// 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.
|
// 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 {
|
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)
|
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
|
continue
|
||||||
|
@ -21,6 +21,9 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"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"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
apimachineryversion "k8s.io/apimachinery/pkg/version"
|
apimachineryversion "k8s.io/apimachinery/pkg/version"
|
||||||
"k8s.io/apiserver/pkg/registry/rest"
|
"k8s.io/apiserver/pkg/registry/rest"
|
||||||
@ -45,7 +48,7 @@ type resourceExpirationEvaluator struct {
|
|||||||
type ResourceExpirationEvaluator interface {
|
type ResourceExpirationEvaluator interface {
|
||||||
// RemoveDeletedKinds inspects the storage map and modifies it in place by removing storage for kinds that have been deleted.
|
// 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.
|
// 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 returns true if a particular version cut off is after the current version
|
||||||
ShouldServeForVersion(majorRemoved, minorRemoved int) bool
|
ShouldServeForVersion(majorRemoved, minorRemoved int) bool
|
||||||
}
|
}
|
||||||
@ -91,8 +94,21 @@ func NewResourceExpirationEvaluator(currentVersion apimachineryversion.Info) (Re
|
|||||||
return ret, nil
|
return ret, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *resourceExpirationEvaluator) shouldServe(resourceServingInfo rest.Storage) bool {
|
func (e *resourceExpirationEvaluator) shouldServe(gv schema.GroupVersion, versioner runtime.ObjectVersioner, resourceServingInfo rest.Storage) bool {
|
||||||
versionedPtr := resourceServingInfo.New()
|
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)
|
removed, ok := versionedPtr.(removedInterface)
|
||||||
if !ok {
|
if !ok {
|
||||||
return true
|
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.
|
// 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.
|
// 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()
|
versionsToRemove := sets.NewString()
|
||||||
for apiVersion, versionToResource := range versionedResourcesStorageMap {
|
for apiVersion, versionToResource := range versionedResourcesStorageMap {
|
||||||
resourcesToRemove := sets.NewString()
|
resourcesToRemove := sets.NewString()
|
||||||
for resourceName, resourceServingInfo := range versionToResource {
|
for resourceName, resourceServingInfo := range versionToResource {
|
||||||
if !e.shouldServe(resourceServingInfo) {
|
if !e.shouldServe(schema.GroupVersion{Group: groupName, Version: apiVersion}, versioner, resourceServingInfo) {
|
||||||
resourcesToRemove.Insert(resourceName)
|
resourcesToRemove.Insert(resourceName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -221,13 +221,27 @@ func Test_resourceExpirationEvaluator_shouldServe(t *testing.T) {
|
|||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
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)
|
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) {
|
func checkErr(t *testing.T, actual error, expected string) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
switch {
|
switch {
|
||||||
@ -309,7 +323,8 @@ func Test_removeDeletedKinds(t *testing.T) {
|
|||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
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) {
|
if !reflect.DeepEqual(tt.expectedStorage, tt.versionedResourcesStorageMap) {
|
||||||
t.Fatal(spew.Sdump(tt.versionedResourcesStorageMap))
|
t.Fatal(spew.Sdump(tt.versionedResourcesStorageMap))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user