Fix revert conflict

Kubernetes-commit: 3be9af427fafe7913dbd2cec87a37f3cf22b8c03

Author: Jefftree

pkg/server/storage/resource_encoding_config.go

@@ -122,7 +122,7 @@ type introducedInterface interface {
 	APILifecycleIntroduced() (major, minor int)
 }
 
-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 basecompatibility.EffectiveVersion, scheme *runtime.Scheme) (schema.GroupVersion, error) {
 	if example == nil || effectiveVersion == nil {
 		return binaryVersionOfResource, nil
 	}