github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Don't pick versions that have a replacement as storage version

Browse Source
This commit is contained in:
Joe Betz 2024-10-30 11:47:43 -04:00
parent d001d5684e
commit af811be190
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,10 @@ type introducedInterface interface {
APILifecycleIntroduced() (major, minor int) APILifecycleIntroduced() (major, minor int)
} }
type replacementInterface interface {
APILifecycleReplacement() schema.GroupVersionKind
}
func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example runtime.Object, effectiveVersion version.EffectiveVersion, scheme *runtime.Scheme) (schema.GroupVersion, error) { func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example runtime.Object, effectiveVersion version.EffectiveVersion, scheme *runtime.Scheme) (schema.GroupVersion, error) {
if example == nil || effectiveVersion == nil { if example == nil || effectiveVersion == nil {
return binaryVersionOfResource, nil return binaryVersionOfResource, nil
@ -170,6 +174,14 @@ func emulatedStorageVersion(binaryVersionOfResource schema.GroupVersion, example
// If it was introduced after current compatibility version, don't use it // If it was introduced after current compatibility version, don't use it
// skip the introduced check for test when currentVersion is 0.0 to test all apis // skip the introduced check for test when currentVersion is 0.0 to test all apis
if introduced, hasIntroduced := exampleOfGVK.(introducedInterface); hasIntroduced && (compatibilityVersion.Major() > 0 || compatibilityVersion.Minor() > 0) { if introduced, hasIntroduced := exampleOfGVK.(introducedInterface); hasIntroduced && (compatibilityVersion.Major() > 0 || compatibilityVersion.Minor() > 0) {
// Skip versions that have a replacement.
// This can be used to override this storage version selection by
// marking a storage version has having a replacement and preventing a
// that storage version from being selected.
if _, hasReplacement := exampleOfGVK.(replacementInterface); hasReplacement {
continue
}
// API resource lifecycles should be relative to k8s api version // API resource lifecycles should be relative to k8s api version
majorIntroduced, minorIntroduced := introduced.APILifecycleIntroduced() majorIntroduced, minorIntroduced := introduced.APILifecycleIntroduced()
introducedVer := apimachineryversion.MajorMinor(uint(majorIntroduced), uint(minorIntroduced)) introducedVer := apimachineryversion.MajorMinor(uint(majorIntroduced), uint(minorIntroduced))