fix watch resources in each controller

Signed-off-by: ldpliu <[email protected]> Signed-off-by: root <[email protected]>
stolostron · Dec 9, 2024 · e9162d4 · e9162d4
1 parent e23ee1f
commit e9162d4
Show file tree

Hide file tree

Showing 18 changed files with 161 additions and 98 deletions.
diff --git a/operator/pkg/config/multiclusterglobalhub_config.go b/operator/pkg/config/multiclusterglobalhub_config.go
@@ -38,6 +38,7 @@ import (
 
 	"github.com/stolostron/multicluster-global-hub/operator/api/operator/v1alpha4"
 	operatorconstants "github.com/stolostron/multicluster-global-hub/operator/pkg/constants"
+	"github.com/stolostron/multicluster-global-hub/pkg/constants"
 	"github.com/stolostron/multicluster-global-hub/pkg/logger"
 )
 
@@ -131,6 +132,27 @@ var MGHPred = predicate.Funcs{
 	},
 }
 
+// watch globalhub applied services
+var GeneralPredicate = predicate.Funcs{
+	CreateFunc: func(e event.CreateEvent) bool {
+		return false
+	},
+	UpdateFunc: func(e event.UpdateEvent) bool {
+		if e.ObjectNew.GetLabels()[constants.GlobalHubOwnerLabelKey] !=
+			constants.GHOperatorOwnerLabelVal {
+			return false
+		}
+		return e.ObjectNew.GetGeneration() != e.ObjectOld.GetGeneration()
+	},
+	DeleteFunc: func(e event.DeleteEvent) bool {
+		if e.Object.GetLabels()[constants.GlobalHubOwnerLabelKey] ==
+			constants.GHOperatorOwnerLabelVal {
+			return true
+		}
+		return false
+	},
+}
+
 // getAnnotation returns the annotation value for a given key, or an empty string if not set
 func getAnnotation(mgh *v1alpha4.MulticlusterGlobalHub, annotationKey string) string {
 	annotations := mgh.GetAnnotations()

diff --git a/operator/pkg/controllers/acm/resources.go b/operator/pkg/controllers/acm/resources.go
@@ -90,10 +90,11 @@ func (r *ACMResourceController) readyToWatchACMResources() bool {
 }
 
 func StartController(opts config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start acm controller")
 	if acmResourceController != nil {
 		return acmResourceController, nil
 	}
+	log.Info("start acm controller")
+
 	acmController := &ACMResourceController{
 		Manager:   opts.Manager,
 		Resources: make(map[string]bool),

diff --git a/operator/pkg/controllers/agent/addon_manager.go b/operator/pkg/controllers/agent/addon_manager.go
@@ -61,11 +61,11 @@ func ReadyToEnableAddonManager(mgh *v1alpha4.MulticlusterGlobalHub) bool {
 }
 
 func StartAddonManagerController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start addon manager controller")
-
 	if addonManagerController != nil {
 		return addonManagerController, nil
 	}
+	log.Info("start addon manager controller")
+
 	if !ReadyToEnableAddonManager(initOption.MulticlusterGlobalHub) {
 		return nil, nil
 	}

diff --git a/operator/pkg/controllers/agent/default_agent_controller.go b/operator/pkg/controllers/agent/default_agent_controller.go
@@ -128,10 +128,11 @@ func NewDefaultAgentController(c client.Client) *DefaultAgentController {
 }
 
 func StartDefaultAgentController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start default agent controller")
 	if defaultAgentController != nil {
 		return defaultAgentController, nil
 	}
+	log.Info("start default agent controller")
+
 	if !ReadyToEnableAddonManager(initOption.MulticlusterGlobalHub) {
 		return nil, nil
 	}

diff --git a/operator/pkg/controllers/agent/hosted_agent_controller.go b/operator/pkg/controllers/agent/hosted_agent_controller.go
@@ -56,14 +56,18 @@ var (
 )
 
 func StartHostedAgentController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start hosted agent  controller")
-
 	if hostedAgentController != nil {
 		return hostedAgentController, nil
 	}
+	if !config.IsACMResourceReady() {
+		return nil, nil
+	}
 	if !config.GetImportClusterInHosted() {
 		return nil, nil
 	}
+
+	log.Info("start hosted agent  controller")
+
 	if !ReadyToEnableAddonManager(initOption.MulticlusterGlobalHub) {
 		return nil, nil
 	}

diff --git a/operator/pkg/controllers/backup/backup_start.go b/operator/pkg/controllers/backup/backup_start.go
@@ -69,13 +69,14 @@ func GetBackupController() *BackupReconciler {
 }
 
 func StartController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Infof("start backup controller")
 	if backupController != nil {
 		return backupController, nil
 	}
 	if !config.IsACMResourceReady() {
 		return nil, nil
 	}
+	log.Infof("start backup controller")
+
 	c := &BackupReconciler{
 		Manager: initOption.Manager,
 		Client:  initOption.Manager.GetClient(),

diff --git a/operator/pkg/controllers/grafana/grafana_reconciler.go b/operator/pkg/controllers/grafana/grafana_reconciler.go
@@ -15,6 +15,7 @@ import (
 	"gopkg.in/yaml.v2"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -51,6 +52,7 @@ import (
 // +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=clusterroles,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=clusterrolebindings,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;delete
+// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;delete;patch
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="apps",resources=deployments,verbs=get;list;watch;create;update;delete
@@ -125,7 +127,6 @@ func (r *GrafanaReconciler) IsResourceRemoved() bool {
 }
 
 func StartController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start grafana controller")
 	if grafanaController != nil {
 		return grafanaController, nil
 	}
@@ -135,6 +136,8 @@ func StartController(initOption config.ControllerOption) (config.ControllerInter
 	if config.GetStorageConnection() == nil {
 		return nil, nil
 	}
+	log.Info("start grafana controller")
+
 	grafanaController = NewGrafanaReconciler(initOption.Manager,
 		initOption.KubeClient)
 	err := grafanaController.SetupWithManager(initOption.Manager)
@@ -156,7 +159,17 @@ func (r *GrafanaReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&corev1.ConfigMap{},
 			&handler.EnqueueRequestForObject{}, builder.WithPredicates(configmapPred)).
 		Watches(&appsv1.Deployment{},
-			&handler.EnqueueRequestForObject{}, builder.WithPredicates(deplomentPred))
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(deploymentPred)).
+		Watches(&corev1.Service{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&corev1.ServiceAccount{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.ClusterRole{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.ClusterRoleBinding{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&routev1.Route{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate))
 
 	if _, err := mgr.GetRESTMapper().KindFor(schema.GroupVersionResource{
 		Group:    "image.openshift.io",
@@ -202,21 +215,6 @@ var imageStreamPred = predicate.Funcs{
 	},
 }
 
-var deplomentPred = predicate.Funcs{
-	CreateFunc: func(e event.CreateEvent) bool {
-		return e.Object.GetNamespace() == commonutils.GetDefaultNamespace() &&
-			e.Object.GetName() == config.COMPONENTS_GRAFANA_NAME
-	},
-	UpdateFunc: func(e event.UpdateEvent) bool {
-		return e.ObjectNew.GetNamespace() == commonutils.GetDefaultNamespace() &&
-			e.ObjectNew.GetName() == config.COMPONENTS_GRAFANA_NAME
-	},
-	DeleteFunc: func(e event.DeleteEvent) bool {
-		return e.Object.GetNamespace() == commonutils.GetDefaultNamespace() &&
-			e.Object.GetName() == config.COMPONENTS_GRAFANA_NAME
-	},
-}
-
 var configmapPred = predicate.Funcs{
 	CreateFunc: func(e event.CreateEvent) bool {
 		return WatchedConfigMap.Has(e.Object.GetName())

diff --git a/operator/pkg/controllers/inventory/inventory_reconciler.go b/operator/pkg/controllers/inventory/inventory_reconciler.go
@@ -68,7 +68,6 @@ func (r *InventoryReconciler) IsResourceRemoved() bool {
 }
 
 func StartController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start inventory controller")
 	if inventoryReconciler != nil {
 		return inventoryReconciler, nil
 	}
@@ -81,6 +80,7 @@ func StartController(initOption config.ControllerOption) (config.ControllerInter
 	if config.GetStorageConnection() == nil {
 		return nil, nil
 	}
+	log.Info("start inventory controller")
 
 	inventoryReconciler = NewInventoryReconciler(initOption.Manager,
 		initOption.KubeClient)
@@ -100,6 +100,12 @@ func (r *InventoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			builder.WithPredicates(config.MGHPred)).
 		Watches(&appsv1.Deployment{},
 			&handler.EnqueueRequestForObject{}, builder.WithPredicates(deploymentPred)).
+		Watches(&corev1.Secret{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&corev1.Service{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&corev1.ServiceAccount{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
 		Complete(r)
 }
 

diff --git a/operator/pkg/controllers/managedhub/managedhub_controller.go b/operator/pkg/controllers/managedhub/managedhub_controller.go
@@ -55,13 +55,14 @@ func (r *ManagedHubController) IsResourceRemoved() bool {
 }
 
 func StartController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start managedhub controller")
 	if managedHubController != nil {
 		return managedHubController, nil
 	}
 	if !config.IsACMResourceReady() {
 		return nil, nil
 	}
+	log.Info("start managedhub controller")
+
 	managedHubController = NewManagedHubController(initOption.Manager)
 	err := managedHubController.SetupWithManager(initOption.Manager)
 	if err != nil {

diff --git a/operator/pkg/controllers/manager/manager_reconciler.go b/operator/pkg/controllers/manager/manager_reconciler.go
@@ -9,16 +9,19 @@ import (
 	"strconv"
 	"time"
 
+	routev1 "github.com/openshift/api/route/v1"
 	promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/discovery/cached/memory"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/restmapper"
+	"open-cluster-management.io/api/addon/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -39,9 +42,11 @@ import (
 )
 
 // +kubebuilder:rbac:groups=operator.open-cluster-management.io,resources=multiclusterglobalhubs,verbs=get;list;watch;
+// +kubebuilder:rbac:groups="route.openshift.io",resources=routes,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=clusterroles,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=clusterrolebindings,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;delete
+// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;delete;patch
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;delete
 // +kubebuilder:rbac:groups="apps",resources=deployments,verbs=get;list;watch;create;update;delete
@@ -85,11 +90,11 @@ var (
 )
 
 func StartController(initOption config.ControllerOption) (config.ControllerInterface, error) {
-	log.Info("start manager controller")
-
 	if managerController != nil {
 		return managerController, nil
 	}
+	log.Info("start manager controller")
+
 	if config.GetTransporterConn() == nil {
 		return nil, nil
 	}
@@ -115,12 +120,32 @@ func (r *ManagerReconciler) IsResourceRemoved() bool {
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *ManagerReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).Named("manager").
+	mgrBuilder := ctrl.NewControllerManagedBy(mgr).Named("manager").
 		For(&v1alpha4.MulticlusterGlobalHub{},
 			builder.WithPredicates(config.MGHPred)).
 		Watches(&appsv1.Deployment{},
 			&handler.EnqueueRequestForObject{}, builder.WithPredicates(deploymentPred)).
-		Complete(r)
+		Watches(&corev1.Service{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&corev1.ServiceAccount{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.ClusterRole{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.ClusterRoleBinding{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.Role{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&rbacv1.RoleBinding{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate)).
+		Watches(&routev1.Route{},
+			&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate))
+
+	if config.IsACMResourceReady() {
+		mgrBuilder = mgrBuilder.
+			Watches(&v1alpha1.ClusterManagementAddOn{},
+				&handler.EnqueueRequestForObject{}, builder.WithPredicates(config.GeneralPredicate))
+	}
+	return mgrBuilder.Complete(r)
 }
 
 var deploymentPred = predicate.Funcs{