remove replciate

Signed-off-by: myan <myan@redhat.com>

Author: yanmxa

agent/pkg/controllers/inventory/inventory.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/stolostron/multicluster-global-hub/agent/pkg/configs"
 	"github.com/stolostron/multicluster-global-hub/agent/pkg/controllers/inventory/managedclusterinfo"
-	"github.com/stolostron/multicluster-global-hub/agent/pkg/status/syncers/policies"
+	"github.com/stolostron/multicluster-global-hub/agent/pkg/controllers/inventory/policy"
 	"github.com/stolostron/multicluster-global-hub/pkg/transport"
 	"github.com/stolostron/multicluster-global-hub/pkg/utils"
 )
@@ -34,7 +34,7 @@ func AddToManager(ctx context.Context, mgr ctrl.Manager, transportClient transpo
 	if err := managedclusterinfo.AddManagedClusterInfoInventorySyncer(mgr, transportClient.GetRequester()); err != nil {
 		return err
 	}
-	if err := policies.AddPolicyInventorySyncer(mgr, transportClient.GetRequester()); err != nil {
+	if err := policy.AddPolicyInventorySyncer(mgr, transportClient.GetRequester()); err != nil {
 		return err
 	}
 	inventoryCtrlStarted = true

agent/pkg/controllers/inventory/policy/policy_controller.go

@@ -2,7 +2,7 @@
 // Copyright Contributors to the Open Cluster Management project
 // Policy Controller is used to send the policy create/update/delete to restful API
 
-package policies
+package policy
 
 import (
 	"context"

agent/pkg/controllers/inventory/policy/policy_controller_test.go

@@ -1,4 +1,4 @@
-package policies
+package policy
 
 import (
 	"context"

agent/pkg/status/syncers/policies/inventory_syncer.go

@@ -19,13 +19,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-<<<<<<< HEAD:agent/pkg/status/controller/policies/policy_controller.go
-	"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/pkg/constants"
-=======
 	"github.com/stolostron/multicluster-global-hub/agent/pkg/configs"
->>>>>>> 709bd7eb (spec):agent/pkg/status/syncers/policies/inventory_syncer.go
 	"github.com/stolostron/multicluster-global-hub/pkg/transport"
 	"github.com/stolostron/multicluster-global-hub/pkg/transport/requester"
 )

agent/pkg/status/syncers/policies/inventory_syncer_test.go

@@ -20,11 +20,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-<<<<<<< HEAD
-	"github.com/stolostron/multicluster-global-hub/pkg/constants"
-=======
 	"github.com/stolostron/multicluster-global-hub/agent/pkg/configs"
->>>>>>> 91fc932c (fix the ut)
 	"github.com/stolostron/multicluster-global-hub/pkg/transport"
 )