fix e2e failure

Signed-off-by: Britania Rodriguez Reyes <[email protected]>

Author: britaniar

cmd/mcs-controller-manager/main.go

@@ -268,6 +268,7 @@ func setupControllersWithManager(_ context.Context, hubMgr, memberMgr manager.Ma
 			MemberClient: memberClient,
 			HubClient:    hubClient,
 			AgentType:    clusterv1beta1.MultiClusterServiceAgent,
+			EnabledNetworkingFeatures: *enableNetworkingFeatures,
 		}).SetupWithManager(hubMgr); err != nil {
 			klog.ErrorS(err, "Unable to create internalmembercluster (v1beta1 API) reconciler")
 			return err

cmd/member-net-controller-manager/main.go

@@ -89,7 +89,7 @@ func init() {
 	utilruntime.Must(fleetnetv1beta1.AddToScheme(scheme))
 	utilruntime.Must(fleetv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(clusterv1beta1.AddToScheme(scheme))
-	
+
 	//+kubebuilder:scaffold:scheme
 }
 
@@ -295,6 +295,7 @@ func setupControllersWithManager(ctx context.Context, hubMgr, memberMgr manager.
 			MemberClient: memberClient,
 			HubClient:    hubClient,
 			AgentType:    clusterv1beta1.ServiceExportImportAgent,
+			EnabledNetworkingFeatures: *enableNetworkingFeatures, // Pass the flag to the reconciler
 		}).SetupWithManager(hubMgr); err != nil {
 			klog.ErrorS(err, "Unable to create internalmembercluster (v1beta1 API) reconciler")
 			return err

pkg/controllers/member/internalmembercluster/v1beta1/controller_v1beta1.go

@@ -39,6 +39,7 @@ type Reconciler struct {
 	MemberClient client.Client
 	HubClient    client.Client
 	AgentType    clusterv1beta1.AgentType
+	EnabledNetworkingFeatures   bool
 }
 
 //+kubebuilder:rbac:groups=cluster.kubernetes-fleet.io,resources=internalmemberclusters,verbs=get;list;watch
@@ -74,12 +75,12 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		klog.V(2).InfoS("member cluster has left the fleet; performing cleanup", "internalMemberCluster", imcKRef)
 
 		// Clean up fleet networking related resources.
-		if r.AgentType == clusterv1beta1.MultiClusterServiceAgent {
+		if r.AgentType == clusterv1beta1.MultiClusterServiceAgent  && r.EnabledNetworkingFeatures{
 			if err := r.cleanupMCSRelatedResources(ctx); err != nil {
 				return ctrl.Result{}, err
 			}
 		}
-		if r.AgentType == clusterv1beta1.ServiceExportImportAgent {
+		if r.AgentType == clusterv1beta1.ServiceExportImportAgent  && r.EnabledNetworkingFeatures {
 			if err := r.cleanupServiceExportRelatedResources(ctx); err != nil {
 				return ctrl.Result{}, err
 			}

test/e2e/join_test.go

@@ -325,7 +325,7 @@ var _ = Describe("Test Join/Leave workflow", Serial, Ordered, func() {
 				Skip("Skipping setting up when networking features are enabled")
 			}
 		})
-		
+
 		Context("Member cluster agents should join/leave fleet", func() {
 			BeforeEach(func() {
 				By("Creating internalMemberCluster")