bugfix: addon manager watches managedclusteraddon

Signed-off-by: yue9944882 <[email protected]>

Author: yue9944882

pkg/addon/controllers/installer.go

@@ -55,38 +55,52 @@ func SetupClusterGatewayInstallerWithManager(mgr ctrl.Manager, caPair *crypto.CA
 		mapper:       mgr.GetRESTMapper(),
 	}
 	return ctrl.NewControllerManagedBy(mgr).
+		// Watches ClusterManagementAddOn singleton
 		For(&addonv1alpha1.ClusterManagementAddOn{}).
+		// Watches ClusterGatewayConfiguration singleton
 		Watches(
 			&source.Kind{
 				Type: &proxyv1alpha1.ClusterGatewayConfiguration{},
 			},
 			&event.ClusterGatewayConfigurationHandler{
 				Client: mgr.GetClient(),
 			}).
+		// Watches ManagedClusterAddon.
+		Watches(
+			&source.Kind{
+				Type: &addonv1alpha1.ManagedClusterAddOn{},
+			},
+			&handler.EnqueueRequestForOwner{
+				OwnerType: &addonv1alpha1.ClusterManagementAddOn{},
+			}).
+		// Cluster-Gateway mTLS certificate should be actively reconciled
 		Watches(
 			&source.Kind{
 				Type: &corev1.Secret{},
 			},
 			&handler.EnqueueRequestForOwner{
 				OwnerType: &addonv1alpha1.ClusterManagementAddOn{},
 			}).
+		// Secrets rotated by ManagedServiceAccount should be actively reconciled
 		Watches(
 			&source.Kind{
 				Type: &corev1.Secret{},
 			},
 			&event.SecretHandler{}).
+		// Cluster-gateway apiserver instances should be actively reconciled
 		Watches(
 			&source.Kind{
 				Type: &appsv1.Deployment{},
 			},
 			&handler.EnqueueRequestForOwner{
 				OwnerType: &addonv1alpha1.ClusterManagementAddOn{},
 			}).
+		// APIService should be actively reconciled
 		Watches(
 			&source.Kind{
 				Type: &apiregistrationv1.APIService{},
 			},
-			&event.APIServiceHandler{}).
+			&event.APIServiceHandler{WatchingName: common.ClusterGatewayAPIServiceName}).
 		Complete(installer)
 }
 

pkg/common/constants.go

@@ -16,3 +16,7 @@ const (
 const (
 	InstallNamespace = "open-cluster-management-cluster-gateway"
 )
+
+const (
+	ClusterGatewayAPIServiceName = "v1alpha1.cluster.core.oam.dev"
+)

pkg/event/apiservice_handler.go

@@ -12,11 +12,8 @@ import (
 
 var _ handler.EventHandler = &APIServiceHandler{}
 
-const (
-	clusterGatewayAPIServiceName = "v1alpha1.cluster.core.oam.dev"
-)
-
 type APIServiceHandler struct {
+	WatchingName string
 }
 
 func (a *APIServiceHandler) Create(event event.CreateEvent, q workqueue.RateLimitingInterface) {
@@ -36,7 +33,7 @@ func (a *APIServiceHandler) Generic(event event.GenericEvent, q workqueue.RateLi
 }
 
 func (a *APIServiceHandler) process(apiService *apiregistrationv1.APIService, q workqueue.RateLimitingInterface) {
-	if apiService.Name == clusterGatewayAPIServiceName {
+	if apiService.Name == a.WatchingName {
 		q.Add(reconcile.Request{
 			NamespacedName: types.NamespacedName{
 				Name: common.AddonName,