bump(k8s): compile fixes

Author: kevinrizza

pkg/config/serving/server.go

@@ -14,8 +14,9 @@ import (
 	"k8s.io/apimachinery/pkg/version"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericapiserveroptions "k8s.io/apiserver/pkg/server/options"
+	"k8s.io/apiserver/pkg/util/compatibility"
 	"k8s.io/client-go/kubernetes"
-	kasversion "k8s.io/component-base/version"
+	kasversioncompatibility "k8s.io/component-base/compatibility"
 	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
@@ -110,13 +111,14 @@ func assertAPIConnection(ctx context.Context, kubeClient *kubernetes.Clientset,
 // DefaultBuildEffectiveVersion returns the MutableEffectiveVersion based on the
 // current build information.
 // Similar to version.DefaultBuildEffectiveVersion
-func defaultBuildEffectiveVersion(versionInfo *version.Info) kasversion.MutableEffectiveVersion {
+// See https://github.com/kubernetes/apiserver/commit/9bb4aa730abaf73aaef17dc9e9608cceb4f904ed#diff-bc93e77a314d3da08bb793695b142f4f32d4e3fdd186fe22c87725d8dec62130R51-R55
+func defaultBuildEffectiveVersion(versionInfo *version.Info) kasversioncompatibility.MutableEffectiveVersion {
 	if versionInfo != nil {
 		// major.minor passed through gitVersion
 		parsedVersion, err := utilversion.Parse(versionInfo.String())
 		if err == nil && (parsedVersion.Major() != 0 || parsedVersion.Minor() != 0) {
-			return kasversion.NewEffectiveVersion(versionInfo.String())
+			return kasversioncompatibility.NewEffectiveVersionFromString(versionInfo.String(), "", "")
 		}
 	}
-	return kasversion.DefaultKubeEffectiveVersion()
+	return compatibility.DefaultBuildEffectiveVersion()
 }

pkg/operator/v1helpers/test_helpers.go

@@ -37,6 +37,10 @@ func (i fakeSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.R
 	return nil, nil
 }
 
+func (i fakeSharedIndexInformer) AddEventHandlerWithOptions(handler cache.ResourceEventHandler, options cache.HandlerOptions) (cache.ResourceEventHandlerRegistration, error) {
+	return nil, nil
+}
+
 func (i fakeSharedIndexInformer) RemoveEventHandler(handle cache.ResourceEventHandlerRegistration) error {
 	panic("implement me")
 }
@@ -57,6 +61,10 @@ func (fakeSharedIndexInformer) Run(stopCh <-chan struct{}) {
 	panic("implement me")
 }
 
+func (fakeSharedIndexInformer) RunWithContext(ctx context.Context) {
+	panic("implement me")
+}
+
 func (fakeSharedIndexInformer) HasSynced() bool {
 	return true
 }
@@ -77,6 +85,10 @@ func (fakeSharedIndexInformer) SetWatchErrorHandler(handler cache.WatchErrorHand
 	panic("implement me")
 }
 
+func (fakeSharedIndexInformer) SetWatchErrorHandlerWithContext(handler cache.WatchErrorHandlerWithContext) error {
+	panic("implement me")
+}
+
 func (fakeSharedIndexInformer) SetTransform(f cache.TransformFunc) error {
 	panic("implement me")
 }