Skip to content

Commit 39fe192

Browse files
fix breaking change in k8s.io/component-base/version
1 parent 946d884 commit 39fe192

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

pkg/package-server/apiserver/config.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@
1515
package apiserver
1616

1717
import (
18+
"fmt"
19+
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apiserver/generic"
20+
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/version"
1821
"strings"
1922

23+
apimachineryversion "k8s.io/apimachinery/pkg/util/version"
2024
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
2125
genericapiserver "k8s.io/apiserver/pkg/server"
2226
"k8s.io/client-go/informers"
23-
utilversion "k8s.io/component-base/version"
27+
compatversion "k8s.io/component-base/compatibility"
2428

25-
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apiserver/generic"
2629
generatedopenapi "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/client/openapi"
27-
"github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/version"
2830
)
2931

3032
// Config contains configuration for launching an instance of package-server.
@@ -40,7 +42,17 @@ type completedConfig struct {
4042

4143
// Complete fills in any fields not set that are required to have valid data. It's mutating the receiver.
4244
func (c *Config) Complete(informers informers.SharedInformerFactory) completedConfig {
43-
c.GenericConfig.EffectiveVersion = utilversion.NewEffectiveVersion(version.VersionInfo().String())
45+
binVer, err := apimachineryversion.ParseSemantic(version.VersionInfo().String())
46+
if err != nil {
47+
panic(fmt.Errorf("invalid version string: %w", err))
48+
}
49+
50+
c.GenericConfig.EffectiveVersion = compatversion.NewEffectiveVersion(
51+
binVer,
52+
false,
53+
nil,
54+
nil,
55+
)
4456

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

0 commit comments

Comments
 (0)