DO NOT MERGE - debug

Signed-off-by: Tom Pantelis <[email protected]>

pkg/agent/controller/agent.go

@@ -124,7 +124,8 @@ func New(spec *AgentSpecification, syncerConf broker.SyncerConfig, agentConfig A
 	agentController.endpointSliceController, err = newEndpointSliceController(spec, syncerConf, agentController.serviceExportClient,
 		agentController.serviceSyncer, func(serviceName string, serviceNamespace string) *mcsv1a1.ServiceImport {
 			obj, found, _ := agentController.serviceImportController.remoteSyncer.GetResource(
-				brokerAggregatedServiceImportName(serviceName, serviceNamespace), syncerConf.BrokerNamespace)
+				brokerAggregatedServiceImportName(serviceName, serviceNamespace),
+				agentController.endpointSliceController.syncer.GetBrokerNamespace())
 			if !found {
 				return nil
 			}

pkg/agent/controller/endpoint_slice.go

@@ -234,8 +234,11 @@ func (c *EndpointSliceController) hasNoRemainingEndpointSlices(endpointSlice *di
 func (c *EndpointSliceController) checkForConflicts(_, name, namespace string) (bool, error) {
 	ctx := context.TODO()
 
+	logger.Infof("**********Checking conflicts for %s/%s", namespace, name)
+
 	localServiceExport := c.serviceExportClient.getLocalInstance(name, namespace)
 	if localServiceExport == nil {
+		logger.Infof("**********localServiceExport NOT FOUND for %s/%s", namespace, name)
 		return false, nil
 	}
 
@@ -256,17 +259,24 @@ func (c *EndpointSliceController) checkForConflicts(_, name, namespace string) (
 	for _, o := range epsList {
 		eps := o.(*discovery.EndpointSlice)
 
+		eps.SetManagedFields(nil)
+		//logger.Infof("**********Checking EPS %s", resource.ToJSON(eps))
+
 		if clusterNames.Has(eps.Labels[constants.MCSLabelSourceCluster]) {
+			logger.Infof("**********Skipping EPS %s/%s", namespace, name)
 			continue
 		}
 
 		clusterNames.Insert(eps.Labels[constants.MCSLabelSourceCluster])
 
+		//logger.Infof("**********Current prevServicePorts %s", resource.ToJSON(prevServicePorts))
+
 		servicePorts := c.serviceExportClient.toServicePorts(eps.Ports)
 		if prevServicePorts == nil {
 			prevServicePorts = servicePorts
 			intersectedServicePorts = servicePorts
 		} else if !slices.Equivalent(prevServicePorts, servicePorts, servicePortKey) {
+			logger.Info("**********CONFLICT!!!!!")
 			conflict = true
 		}
 
@@ -276,7 +286,8 @@ func (c *EndpointSliceController) checkForConflicts(_, name, namespace string) (
 	if conflict {
 		aggregatedSI := c.aggregatedServiceImportGetter(name, namespace)
 		if aggregatedSI == nil {
-			return false, nil
+			logger.Infof("**********aggregatedSI NOT FOUND for %s/%s", namespace, name)
+			return true, nil
 		}
 
 		exposedOp := "intersection"