remove namespace mutex

internal/controller/experimental.go

@@ -422,10 +422,7 @@ func (r *ReconcileOpenLiberty) reconcileBindings(instance *olv1.OpenLibertyAppli
 func (r *ReconcileOpenLiberty) reconcilePasswordEncryptionKeyConcurrent(instance *olv1.OpenLibertyApplication, instanceMutex *sync.Mutex, passwordEncryptionMetadata *lutils.PasswordEncryptionMetadata, sharedResourceReconcileResultChan chan<- ReconcileResult, lastRotationChan chan<- string, encryptionSecretNameChan chan<- string) {
 	// Manage the shared password encryption key Secret if it exists
 	instanceMutex.Lock()
-	namespaceLocks, _ := namespaceLockMap.Load(instance.GetNamespace())
-	namespaceLocks.([]*sync.Mutex)[2].Lock()
 	message, encryptionSecretName, passwordEncryptionKeyLastRotation, err := r.reconcilePasswordEncryptionKey(instance, passwordEncryptionMetadata)
-	namespaceLocks.([]*sync.Mutex)[2].Unlock()
 	instanceMutex.Unlock()
 	lastRotationChan <- passwordEncryptionKeyLastRotation
 	encryptionSecretNameChan <- encryptionSecretName
@@ -439,10 +436,7 @@ func (r *ReconcileOpenLiberty) reconcilePasswordEncryptionKeyConcurrent(instance
 func (r *ReconcileOpenLiberty) reconcileLTPAKeysConcurrent(instance *olv1.OpenLibertyApplication, instanceMutex *sync.Mutex, ltpaKeysMetadata *lutils.LTPAMetadata, ltpaConfigMetadata *lutils.LTPAMetadata, reconcileResultChan chan<- ReconcileResult, lastRotationChan chan<- string, ltpaSecretNameChan chan<- string, ltpaKeysLastRotationChan chan<- string) {
 	// Create and manage the shared LTPA keys Secret if the feature is enabled
 	instanceMutex.Lock()
-	namespaceLocks, _ := namespaceLockMap.Load(instance.GetNamespace())
-	namespaceLocks.([]*sync.Mutex)[0].Lock()
 	message, ltpaSecretName, ltpaKeysLastRotation, err := r.reconcileLTPAKeys(instance, ltpaKeysMetadata, ltpaConfigMetadata)
-	namespaceLocks.([]*sync.Mutex)[0].Unlock()
 	instanceMutex.Unlock()
 	ltpaSecretNameChan <- ltpaSecretName
 	lastRotationChan <- ltpaKeysLastRotation
@@ -483,10 +477,7 @@ func (r *ReconcileOpenLiberty) reconcileLTPAConfigConcurrent(instance *olv1.Open
 
 	// Using the LTPA keys and config metadata, create and manage the shared LTPA Liberty server XML if the feature is enabled
 	instanceMutex.Lock()
-	namespaceLocks, _ := namespaceLockMap.Load(instance.GetNamespace())
-	namespaceLocks.([]*sync.Mutex)[1].Lock()
 	message, ltpaXMLSecretName, err := r.reconcileLTPAConfig(instance, ltpaKeysMetadata, ltpaConfigMetadata, passwordEncryptionMetadata, ltpaKeysLastRotation, lastKeyRelatedRotation)
-	namespaceLocks.([]*sync.Mutex)[1].Unlock()
 	instanceMutex.Unlock()
 	ltpaXMLSecretNameChan <- ltpaXMLSecretName
 	if err != nil {

internal/controller/openlibertyapplication_controller.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"sync"
 
 	networkingv1 "k8s.io/api/networking/v1"
 
@@ -52,12 +51,6 @@ type ReconcileOpenLiberty struct {
 	watchNamespaces []string
 }
 
-var namespaceLockMap *sync.Map
-
-func init() {
-	namespaceLockMap = &sync.Map{}
-}
-
 const applicationFinalizer = "finalizer.openlibertyapplications.apps.openliberty.io"
 
 // +kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,resourceNames=restricted,verbs=use,namespace=open-liberty-operator
@@ -205,12 +198,6 @@ func (r *ReconcileOpenLiberty) Reconcile(ctx context.Context, request ctrl.Reque
 
 	// From here, the Open Liberty Application instance is stored in shared memory and can begin concurrent actions.
 	if r.isConcurrencyEnabled(instance) {
-		ns := instance.GetNamespace()
-		// initialize a mutex for the namespace
-		if _, found := namespaceLockMap.Load(ns); !found {
-			namespaceLockMap.Store(ns, []*sync.Mutex{&sync.Mutex{}, &sync.Mutex{}, &sync.Mutex{}})
-		}
-
 		return r.concurrentReconcile(ba, instance, reqLogger, isKnativeSupported, ctx, request)
 	} else {
 		return r.sequentialReconcile(ba, instance, reqLogger, isKnativeSupported, ctx, request)