github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

API emulation versioning honors cohabitating resources

Browse Source
This commit is contained in:
xuzhenglun 2024-09-09 17:54:35 +08:00
parent 1f7b707f26
commit 880e026a07
No known key found for this signature in database
GPG Key ID: 43BD51D11716234A
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
staging/src/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go
View File

@ -130,13 +130,24 @@ func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example
gvks, _, err := scheme.ObjectKinds(example) gvks, _, err := scheme.ObjectKinds(example)
if err != nil { if err != nil {
return schema.GroupVersion{}, err return schema.GroupVersion{}, err
} else if len(gvks) == 0 { }
// Probably shouldn't happen if err is non-nil
var gvk schema.GroupVersionKind
for _, item := range gvks {
if item.Group != binaryVersionOfResource.Group {
continue
}
gvk = item
break
}
if len(gvk.Kind) == 0 {
return schema.GroupVersion{}, fmt.Errorf("object %T has no GVKs registered in scheme", example) return schema.GroupVersion{}, fmt.Errorf("object %T has no GVKs registered in scheme", example)
} }
// VersionsForGroupKind returns versions in priority order // VersionsForGroupKind returns versions in priority order
versions := scheme.VersionsForGroupKind(schema.GroupKind{Group: gvks[0].Group, Kind: gvks[0].Kind}) versions := scheme.VersionsForGroupKind(schema.GroupKind{Group: gvk.Group, Kind: gvk.Kind})
compatibilityVersion := effectiveVersion.MinCompatibilityVersion() compatibilityVersion := effectiveVersion.MinCompatibilityVersion()
@ -148,7 +159,7 @@ func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example
gvk := schema.GroupVersionKind{ gvk := schema.GroupVersionKind{
Group: gv.Group, Group: gv.Group,
Version: gv.Version, Version: gv.Version,
Kind: gvks[0].Kind, Kind: gvk.Kind,
} }
exampleOfGVK, err := scheme.New(gvk) exampleOfGVK, err := scheme.New(gvk)

2
staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory.go
View File

@ -245,7 +245,7 @@ func (s *DefaultStorageFactory) NewConfig(groupResource schema.GroupResource, ex
var err error var err error
if backwardCompatibleInterface, ok := s.ResourceEncodingConfig.(CompatibilityResourceEncodingConfig); ok { if backwardCompatibleInterface, ok := s.ResourceEncodingConfig.(CompatibilityResourceEncodingConfig); ok {
codecConfig.StorageVersion, err = backwardCompatibleInterface.BackwardCompatibileStorageEncodingFor(groupResource, example) codecConfig.StorageVersion, err = backwardCompatibleInterface.BackwardCompatibileStorageEncodingFor(chosenStorageResource, example)
if err != nil { if err != nil {
return nil, err return nil, err
} }