Update code for k8s v0.28.5 compatibility

Fix unit-tests as well

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

cmd/olm/manager.go

@@ -17,6 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
@@ -54,8 +55,8 @@ func Manager(ctx context.Context, debug bool) (ctrl.Manager, error) {
 
 	setupLog.Info("configuring manager")
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: "0", // TODO(njhale): Enable metrics on non-conflicting port (not 8080)
+		Scheme:  scheme,
+		Metrics: metricsserver.Options{BindAddress: "0"},
 		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&appsv1.Deployment{}: {

pkg/controller/operators/catalog/operator.go

@@ -2173,7 +2173,7 @@ func validateV1Beta1CRDCompatibility(dynamicClient dynamic.Interface, oldCRD *ap
 func validateExistingCRs(dynamicClient dynamic.Interface, gr schema.GroupResource, validationsMap map[string]*apiextensions.CustomResourceValidation) error {
 	for version, schemaValidation := range validationsMap {
 		// create validator from given crdValidation
-		validator, _, err := validation.NewSchemaValidator(schemaValidation)
+		validator, _, err := validation.NewSchemaValidator(schemaValidation.OpenAPIV3Schema)
 		if err != nil {
 			return fmt.Errorf("error creating validator for schema version %s: %s", version, err)
 		}

pkg/controller/operators/openshift/suite_test.go

@@ -17,6 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 func TestControllers(t *testing.T) {
@@ -68,7 +69,7 @@ var _ = BeforeSuite(func() {
 	}
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		MetricsBindAddress: "0", // Prevents conflicts with other test suites that might bind metrics
+		Metrics: metricsserver.Options{BindAddress: "0"},
 	})
 	Expect(err).ToNot(HaveOccurred())
 

pkg/controller/operators/suite_test.go

@@ -23,6 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	// +kubebuilder:scaffold:imports
 
@@ -103,8 +104,8 @@ var _ = BeforeSuite(func() {
 	Expect(metav1.AddMetaToScheme(scheme)).To(Succeed())
 	Expect(AddToScheme(scheme)).To(Succeed())
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		MetricsBindAddress: "0", // Prevents conflicts with other test suites that might bind metrics
-		Scheme:             scheme,
+		Metrics: metricsserver.Options{BindAddress: "0"},
+		Scheme:  scheme,
 	})
 	Expect(err).ToNot(HaveOccurred())
 

pkg/lib/controller-runtime/client/fake_ssa.go

@@ -12,7 +12,7 @@ import (
 // FakeApplier provides a wrapper around the fake k8s controller client to convert the unsupported apply-type patches to merge patches.
 func NewFakeApplier(scheme *runtime.Scheme, owner string, objs ...runtime.Object) *ServerSideApplier {
 	return &ServerSideApplier{
-		client: &fakeApplier{fakecontrollerclient.NewFakeClientWithScheme(scheme, objs...)},
+		client: &fakeApplier{fakecontrollerclient.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(objs...).Build()},
 		Scheme: scheme,
 		Owner:  k8scontrollerclient.FieldOwner(owner),
 	}