Enable placement syncers for global resouces (stolostron#876)

* enable placement syncers for global resouces Signed-off-by: Meng Yan <[email protected]> * fix the ut Signed-off-by: Meng Yan <[email protected]> --------- Signed-off-by: Meng Yan <[email protected]>
yanmxa · Apr 12, 2024 · 374215a · 374215a
1 parent 486c0f6
commit 374215a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/agent/pkg/status/controller/placement/integration_test.go b/agent/pkg/status/controller/placement/integration_test.go
@@ -60,10 +60,14 @@ var _ = Describe("Placement integration test", Ordered, func() {
 
 	It("should be able to sync placement decision", func() {
 		By("Create placementdecision")
+		testGlobalPlacementDecisionOriginUID := "test-globalplacement-decision-uid"
 		testPlacementDecision := &clusterv1beta1.PlacementDecision{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-placementdecision-1",
 				Namespace: "default",
+				Annotations: map[string]string{
+					constants.OriginOwnerReferenceAnnotation: testGlobalPlacementDecisionOriginUID,
+				},
 			},
 			Status: clusterv1beta1.PlacementDecisionStatus{},
 		}

diff --git a/agent/pkg/status/controller/placement/placement_decision_syncer.go b/agent/pkg/status/controller/placement/placement_decision_syncer.go
@@ -11,8 +11,10 @@ import (
 	"github.com/stolostron/multicluster-global-hub/agent/pkg/config"
 	statusconfig "github.com/stolostron/multicluster-global-hub/agent/pkg/status/controller/config"
 	"github.com/stolostron/multicluster-global-hub/agent/pkg/status/controller/generic"
+	"github.com/stolostron/multicluster-global-hub/pkg/constants"
 	"github.com/stolostron/multicluster-global-hub/pkg/enum"
 	"github.com/stolostron/multicluster-global-hub/pkg/transport"
+	"github.com/stolostron/multicluster-global-hub/pkg/utils"
 )
 
 func LaunchPlacementDecisionSyncer(ctx context.Context, mgr ctrl.Manager, agentConfig *config.AgentConfig,
@@ -25,7 +27,7 @@ func LaunchPlacementDecisionSyncer(ctx context.Context, mgr ctrl.Manager, agentC
 	// emitter config
 	placementDecisionEmitter := generic.ObjectEmitterWrapper(enum.PlacementDecisionType,
 		func(obj client.Object) bool {
-			return true // resource
+			return utils.HasAnnotation(obj, constants.OriginOwnerReferenceAnnotation) // global resource
 		}, func(obj client.Object) {
 			obj.SetManagedFields(nil)
 		}, false)

diff --git a/agent/pkg/status/controller/placement/placement_rule_syncer.go b/agent/pkg/status/controller/placement/placement_rule_syncer.go
@@ -31,8 +31,7 @@ func LaunchPlacementRuleSyncer(ctx context.Context, mgr ctrl.Manager, agentConfi
 	}
 	globalPlacementRuleEmitter := generic.ObjectEmitterWrapper(enum.PlacementRuleSpecType,
 		func(obj client.Object) bool {
-			return agentConfig.EnableGlobalResource &&
-				utils.HasAnnotation(obj, constants.OriginOwnerReferenceAnnotation)
+			return utils.HasAnnotation(obj, constants.OriginOwnerReferenceAnnotation) // global resource
 		}, tweakFunc, false)
 
 	localPlacementRuleEmitter := generic.ObjectEmitterWrapper(enum.LocalPlacementRuleSpecType,
@@ -43,7 +42,7 @@ func LaunchPlacementRuleSyncer(ctx context.Context, mgr ctrl.Manager, agentConfi
 		}, tweakFunc, false)
 
 	// syncer
-	name := "status.placement_decision"
+	name := "status.placement_rule"
 	syncInterval := statusconfig.GetPolicyDuration
 
 	return generic.LaunchGenericObjectSyncer(

diff --git a/agent/pkg/status/controller/placement/placement_syncer.go b/agent/pkg/status/controller/placement/placement_syncer.go
@@ -27,8 +27,7 @@ func LaunchPlacementSyncer(ctx context.Context, mgr ctrl.Manager, agentConfig *c
 	// emitter config
 	globalPlacementEmitter := generic.ObjectEmitterWrapper(enum.PlacementSpecType,
 		func(obj client.Object) bool {
-			return agentConfig.EnableGlobalResource &&
-				utils.HasAnnotation(obj, constants.OriginOwnerReferenceAnnotation)
+			return utils.HasAnnotation(obj, constants.OriginOwnerReferenceAnnotation) // global resource
 		},
 		func(obj client.Object) {
 			obj.SetManagedFields(nil)