NO-JIRA: Add thread-safe AddSchemes() to fix concurrent map writes

pkg/internal/schema.go

@@ -0,0 +1,26 @@
+package internal
+
+import (
+	"fmt"
+	"sync"
+
+	"k8s.io/client-go/kubernetes/scheme"
+
+	proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"
+)
+
+var (
+	addSchemesOnce sync.Once
+	addSchemesErr  error
+)
+
+// AddSchemes registers the proposalv1alpha1 scheme with the global Kubernetes scheme.
+// This function is safe to call concurrently and will only execute once.
+func AddSchemes() error {
+	addSchemesOnce.Do(func() {
+		if err := proposalv1alpha1.AddToScheme(scheme.Scheme); err != nil {
+			addSchemesErr = fmt.Errorf("failed to add proposalv1alpha1 to scheme: %w", err)
+		}
+	})
+	return addSchemesErr
+}

pkg/internal/schema_test.go

@@ -0,0 +1,35 @@
+package internal
+
+import (
+	"sync"
+	"testing"
+)
+
+// TestAddSchemesConcurrent verifies that AddSchemes can be called concurrently
+// without causing race conditions or panics. This is a regression test for
+// "fatal error: concurrent map writes" when integration tests run in parallel.
+func TestAddSchemesConcurrent(t *testing.T) {
+	const numGoroutines = 10
+
+	var wg sync.WaitGroup
+	errChan := make(chan error, numGoroutines)
+
+	// Call AddSchemes concurrently from multiple goroutines
+	for i := 0; i < numGoroutines; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := AddSchemes(); err != nil {
+				errChan <- err
+			}
+		}()
+	}
+
+	wg.Wait()
+	close(errChan)
+
+	// Check if any goroutine encountered an error
+	for err := range errChan {
+		t.Errorf("AddSchemes failed: %v", err)
+	}
+}

pkg/proposal/controller_test.go

@@ -17,15 +17,15 @@ 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"
+
+	"github.com/openshift/cluster-version-operator/pkg/internal"
 )
 
 func init() {
-	err := proposalv1alpha1.AddToScheme(scheme.Scheme)
-	if err != nil {
+	if err := internal.AddSchemes(); err != nil {
 		panic(err)
 	}
 }

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,7 +639,7 @@ func (o *Options) NewControllerContext(
 	cvoKubeClient := cb.KubeClientOrDie(o.Namespace, useProtobuf)
 	o.PromQLTarget.KubeClient = cvoKubeClient
 
-	if err := addSchemes(); err != nil {
+	if err := internal.AddSchemes(); err != nil {
 		return nil, err
 	}
 	rtClient := cb.RuntimeControllerClientOrDie("runtime-controller-client")