File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed
pkg/package-server/apiserver Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -17,10 +17,11 @@ package apiserver
17
17
import (
18
18
"strings"
19
19
20
+ utilversion "k8s.io/apimachinery/pkg/util/version"
20
21
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
21
22
genericapiserver "k8s.io/apiserver/pkg/server"
22
23
"k8s.io/client-go/informers"
23
- utilversion "k8s.io/component-base/version "
24
+ "k8s.io/component-base/compatibility "
24
25
25
26
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apiserver/generic"
26
27
generatedopenapi "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/client/openapi"
@@ -40,7 +41,17 @@ type completedConfig struct {
40
41
41
42
// Complete fills in any fields not set that are required to have valid data. It's mutating the receiver.
42
43
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 , // Use default build binary version flag
51
+ emulationFloor ,
52
+ minCompatFloor ,
53
+ )
54
+ c .GenericConfig .EffectiveVersion = effectiveVersion
44
55
45
56
// enable OpenAPI schemas
46
57
c .GenericConfig .OpenAPIConfig = genericapiserver .DefaultOpenAPIConfig (generatedopenapi .GetOpenAPIDefinitions , openapinamer .NewDefinitionNamer (generic .Scheme ))
You can’t perform that action at this time.
0 commit comments