Skip to content

Commit 75a73b8

Browse files
Fix breaking change: the func utilversion.NewEffectiveVersion is no longer provided
1 parent 946d884 commit 75a73b8

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

pkg/package-server/apiserver/config.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ package apiserver
1717
import (
1818
"strings"
1919

20+
utilversion "k8s.io/apimachinery/pkg/util/version"
2021
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
2122
genericapiserver "k8s.io/apiserver/pkg/server"
2223
"k8s.io/client-go/informers"
23-
utilversion "k8s.io/component-base/version"
24+
"k8s.io/component-base/compatibility"
2425

2526
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apiserver/generic"
2627
generatedopenapi "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/client/openapi"
@@ -40,7 +41,17 @@ type completedConfig struct {
4041

4142
// Complete fills in any fields not set that are required to have valid data. It's mutating the receiver.
4243
func (c *Config) Complete(informers informers.SharedInformerFactory) completedConfig {
43-
c.GenericConfig.EffectiveVersion = utilversion.NewEffectiveVersion(version.VersionInfo().String())
44+
binaryVer := utilversion.MustParseSemantic(version.VersionInfo().String())
45+
emulationFloor := binaryVer
46+
minCompatFloor := binaryVer.SubtractMinor(1)
47+
48+
effectiveVersion := compatibility.NewEffectiveVersion(
49+
binaryVer,
50+
false,
51+
emulationFloor,
52+
minCompatFloor,
53+
)
54+
c.GenericConfig.EffectiveVersion = effectiveVersion
4455

4556
// enable OpenAPI schemas
4657
c.GenericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(generic.Scheme))

0 commit comments

Comments
 (0)