From 115d44c1c61c668a011cb4f247a0ebd62ca4e900 Mon Sep 17 00:00:00 2001
From: Vincent de Phily <vdephily@redhat.com>
Date: Tue, 9 Jun 2026 19:11:20 +0100
Subject: [PATCH] WIP

---
 pkg/proposal/controller.go      |  7 +++++++
 pkg/proposal/controller_test.go |  8 --------
 pkg/start/start.go              | 11 -----------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkg/proposal/controller.go b/pkg/proposal/controller.go
index 9e13e9770..c136eda04 100644
--- a/pkg/proposal/controller.go
+++ b/pkg/proposal/controller.go
@@ -22,6 +22,7 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"
+	"k8s.io/client-go/kubernetes/scheme"
 
 	i "github.com/openshift/cluster-version-operator/pkg/internal"
 )
@@ -47,6 +48,12 @@ type getCurrentVersionFunc func() string
 
 type configMapGetterFunc func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*corev1.ConfigMap, error)
 
+func init() {
+	if err := proposalv1alpha1.AddToScheme(scheme.Scheme); err != nil {
+		panic(err)
+	}
+}
+
 // NewController returns Controller to manage Proposals.
 // It monitors available and conditional updates, and creates a LightspeedProposal for every target version of them.
 // It expires (and replace) any previous LightspeedProposals owned by the CVO after 24h.
diff --git a/pkg/proposal/controller_test.go b/pkg/proposal/controller_test.go
index 9c9d58563..5b54c130d 100644
--- a/pkg/proposal/controller_test.go
+++ b/pkg/proposal/controller_test.go
@@ -17,19 +17,11 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kutilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/kubernetes/scheme"
 
 	configv1 "github.com/openshift/api/config/v1"
 	proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"
 )
 
-func init() {
-	err := proposalv1alpha1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		panic(err)
-	}
-}
-
 func TestController_Sync(t *testing.T) {
 	tests := []struct {
 		name              string
diff --git a/pkg/start/start.go b/pkg/start/start.go
index b1a6291e3..cd06624a6 100644
--- a/pkg/start/start.go
+++ b/pkg/start/start.go
@@ -40,7 +40,6 @@ import (
 	operatorinformers "github.com/openshift/client-go/operator/informers/externalversions"
 	"github.com/openshift/library-go/pkg/config/clusterstatus"
 	libgoleaderelection "github.com/openshift/library-go/pkg/config/leaderelection"
-	proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"
 
 	"github.com/openshift/cluster-version-operator/pkg/autoupdate"
 	"github.com/openshift/cluster-version-operator/pkg/clusterconditions"
@@ -615,13 +614,6 @@ type Context struct {
 	OperatorInformerFactory operatorinformers.SharedInformerFactory
 }
 
-func addSchemes() error {
-	if err := proposalv1alpha1.AddToScheme(scheme.Scheme); err != nil {
-		return fmt.Errorf("failed to add proposalv1alpha1 to scheme: %w", err)
-	}
-	return nil
-}
-
 // NewControllerContext initializes the default Context for the current Options. It does
 // not start any background processes.
 func (o *Options) NewControllerContext(
@@ -647,9 +639,6 @@ func (o *Options) NewControllerContext(
 	cvoKubeClient := cb.KubeClientOrDie(o.Namespace, useProtobuf)
 	o.PromQLTarget.KubeClient = cvoKubeClient
 
-	if err := addSchemes(); err != nil {
-		return nil, err
-	}
 	rtClient := cb.RuntimeControllerClientOrDie("runtime-controller-client")
 
 	cvo, err := cvo.New(