address comments

Zhiying Lin · Zhiying Lin · commit 614d0558552f · 2024-08-07T11:53:13.000+08:00
diff --git a/pkg/controllers/member/endpointslice/controller.go b/pkg/controllers/member/endpointslice/controller.go
@@ -113,8 +113,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, nil
 	}
 
+	// When the member leaves, the controller will continue to unexport the endpointSlice as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("EndpointSlice controller is not started yet, requeue the request", "endpointSlice", endpointSliceRef)
+		klog.V(2).InfoS("EndpointSlice controller has not joined yet, skip exporting the endpointSlice and requeue the request", "endpointSlice", endpointSliceRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 
diff --git a/pkg/controllers/member/endpointsliceimport/controller.go b/pkg/controllers/member/endpointsliceimport/controller.go
@@ -133,8 +133,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, nil
 	}
 
+	// When the member leaves, the controller will continue to handle the deleted endpointSliceImport as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("EndpointSliceImport controller is not started yet, requeue the request", "endpointSliceImport", endpointSliceImportRef)
+		klog.V(2).InfoS("EndpointSliceImport controller has not joined yet, skip importing the endpointSlice and requeue the request", "endpointSliceImport", endpointSliceImportRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 
diff --git a/pkg/controllers/member/internalserviceexport/controller.go b/pkg/controllers/member/internalserviceexport/controller.go
@@ -133,8 +133,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, err
 	}
 
+	// When the member leaves, the controller will continue to handle deleted ServiceExport as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("InternalServiceExport controller is not started yet, requeue the request", "internalServiceExport", internalSvcExportRef)
+		klog.V(2).InfoS("InternalServiceExport controller has not joined yet, skip validating serviceExport and requeue the request", "internalServiceExport", internalSvcExportRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 
diff --git a/pkg/controllers/member/internalserviceimport/controller.go b/pkg/controllers/member/internalserviceimport/controller.go
@@ -81,8 +81,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, err
 	}
 
+	// When the member leaves, the controller will continue to handle the deleted serviceImport as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("InternalServiceImport controller is not started yet, requeue the request", "internalServiceImport", internalSvcImportKRef)
+		klog.V(2).InfoS("InternalServiceImport controller has not joined yet, skip updating serviceImport status and requeue the request", "internalServiceImport", internalSvcImportKRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 
diff --git a/pkg/controllers/member/serviceexport/controller.go b/pkg/controllers/member/serviceexport/controller.go
@@ -106,8 +106,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, nil
 	}
 
+	// When the member leaves, the controller will continue to handle the deleted serviceExport as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("ServiceExport controller is not started yet, requeue the request", "service", svcRef)
+		klog.V(2).InfoS("ServiceExport controller has not joined yet, skip handling serviceExport and requeue the request", "service", svcRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 
diff --git a/pkg/controllers/member/serviceimport/controller.go b/pkg/controllers/member/serviceimport/controller.go
@@ -99,8 +99,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, nil
 	}
 
+	// When the member leaves, the controller will continue to handle the deleted serviceImport as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("ServiceImport controller is not started yet, requeue the request", "serviceImport", serviceImportRef)
+		klog.V(2).InfoS("ServiceImport controller has not joined yet, skip handling serviceImport and requeue the request", "serviceImport", serviceImportRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 
diff --git a/pkg/controllers/multiclusterservice/controller.go b/pkg/controllers/multiclusterservice/controller.go
@@ -100,8 +100,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return r.handleDelete(ctx, &mcs)
 	}
 
+	// When the member leaves, the controller will continue to handle the deleted multiClusterService as intended.
 	if !r.joined.Load() {
-		klog.V(2).InfoS("MultiClusterService controller is not started yet, requeue the request", "multiClusterService", mcsKRef)
+		klog.V(2).InfoS("MultiClusterService controller has not joined yet, skip handling the multiClusterService and requeue the request", "multiClusterService", mcsKRef)
 		return ctrl.Result{RequeueAfter: time.Second * 5}, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`113`	`113`	`return ctrl.Result{}, nil`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ // When the member leaves, the controller will continue to unexport the endpointSlice as intended.`
`116`	`117`	`if !r.joined.Load() {`
`117`		`- klog.V(2).InfoS("EndpointSlice controller is not started yet, requeue the request", "endpointSlice", endpointSliceRef)`
	`118`	`+ klog.V(2).InfoS("EndpointSlice controller has not joined yet, skip exporting the endpointSlice and requeue the request", "endpointSlice", endpointSliceRef)`
`118`	`119`	`return ctrl.Result{RequeueAfter: time.Second * 5}, nil`
`119`	`120`	`}`
`120`	`121`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`133`	`133`	`return ctrl.Result{}, nil`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ // When the member leaves, the controller will continue to handle the deleted endpointSliceImport as intended.`
`136`	`137`	`if !r.joined.Load() {`
`137`		`- klog.V(2).InfoS("EndpointSliceImport controller is not started yet, requeue the request", "endpointSliceImport", endpointSliceImportRef)`
	`138`	`+ klog.V(2).InfoS("EndpointSliceImport controller has not joined yet, skip importing the endpointSlice and requeue the request", "endpointSliceImport", endpointSliceImportRef)`
`138`	`139`	`return ctrl.Result{RequeueAfter: time.Second * 5}, nil`
`139`	`140`	`}`
`140`	`141`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`81`	`81`	`return ctrl.Result{}, err`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ // When the member leaves, the controller will continue to handle the deleted serviceImport as intended.`
`84`	`85`	`if !r.joined.Load() {`
`85`		`- klog.V(2).InfoS("InternalServiceImport controller is not started yet, requeue the request", "internalServiceImport", internalSvcImportKRef)`
	`86`	`+ klog.V(2).InfoS("InternalServiceImport controller has not joined yet, skip updating serviceImport status and requeue the request", "internalServiceImport", internalSvcImportKRef)`
`86`	`87`	`return ctrl.Result{RequeueAfter: time.Second * 5}, nil`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`106`	`106`	`return ctrl.Result{}, nil`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ // When the member leaves, the controller will continue to handle the deleted serviceExport as intended.`
`109`	`110`	`if !r.joined.Load() {`
`110`		`- klog.V(2).InfoS("ServiceExport controller is not started yet, requeue the request", "service", svcRef)`
	`111`	`+ klog.V(2).InfoS("ServiceExport controller has not joined yet, skip handling serviceExport and requeue the request", "service", svcRef)`
`111`	`112`	`return ctrl.Result{RequeueAfter: time.Second * 5}, nil`
`112`	`113`	`}`
`113`	`114`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`99`	`99`	`return ctrl.Result{}, nil`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ // When the member leaves, the controller will continue to handle the deleted serviceImport as intended.`
`102`	`103`	`if !r.joined.Load() {`
`103`		`- klog.V(2).InfoS("ServiceImport controller is not started yet, requeue the request", "serviceImport", serviceImportRef)`
	`104`	`+ klog.V(2).InfoS("ServiceImport controller has not joined yet, skip handling serviceImport and requeue the request", "serviceImport", serviceImportRef)`
`104`	`105`	`return ctrl.Result{RequeueAfter: time.Second * 5}, nil`
`105`	`106`	`}`
`106`	`107`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`100`	`100`	`return r.handleDelete(ctx, &mcs)`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ // When the member leaves, the controller will continue to handle the deleted multiClusterService as intended.`
`103`	`104`	`if !r.joined.Load() {`
`104`		`- klog.V(2).InfoS("MultiClusterService controller is not started yet, requeue the request", "multiClusterService", mcsKRef)`
	`105`	`+ klog.V(2).InfoS("MultiClusterService controller has not joined yet, skip handling the multiClusterService and requeue the request", "multiClusterService", mcsKRef)`
`105`	`106`	`return ctrl.Result{RequeueAfter: time.Second * 5}, nil`
`106`	`107`	`}`
`107`	`108`