fix migration issues (#1159)

Signed-off-by: clyang82 <[email protected]>
Co-authored-by: clyang82 <[email protected]>

Author: openshift-cherrypick-robot

agent/pkg/spec/controller/syncers/migration_from_syncer.go

@@ -19,6 +19,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	bundleevent "github.com/stolostron/multicluster-global-hub/pkg/bundle/event"
+	"github.com/stolostron/multicluster-global-hub/pkg/constants"
 )
 
 const (
@@ -137,10 +138,13 @@ func (s *managedClusterMigrationFromSyncer) Sync(ctx context.Context, payload []
 		if annotations == nil {
 			annotations = make(map[string]string)
 		}
-		if annotations["agent.open-cluster-management.io/klusterlet-config"] == klusterletConfig.Name {
+
+		_, migrating := annotations[constants.ManagedClusterMigrating]
+		if migrating && annotations["agent.open-cluster-management.io/klusterlet-config"] == klusterletConfig.Name {
 			continue
 		}
 		annotations["agent.open-cluster-management.io/klusterlet-config"] = klusterletConfig.Name
+		annotations[constants.ManagedClusterMigrating] = ""
 		mcl.SetAnnotations(annotations)
 		if err := s.client.Update(ctx, mcl); err != nil {
 			return err

agent/pkg/status/controller/managedclusters/managed_cluster_syncer.go

@@ -31,7 +31,7 @@ func LaunchManagedClusterSyncer(ctx context.Context, mgr ctrl.Manager, agentConf
 		})
 	}
 	emitter := generic.ObjectEmitterWrapper(enum.ManagedClusterType, func(obj client.Object) bool {
-		return true
+		return !utils.HasAnnotation(obj, constants.ManagedClusterMigrating)
 	}, tweakFunc, false)
 
 	return generic.LaunchGenericObjectSyncer(

operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml

@@ -31,7 +31,7 @@ metadata:
     categories: Integration & Delivery,OpenShift Optional
     certified: "false"
     containerImage: quay.io/stolostron/multicluster-global-hub-operator:latest
-    createdAt: "2024-09-26T06:54:09Z"
+    createdAt: "2024-10-10T05:42:48Z"
     description: Manages the installation and upgrade of the Multicluster Global Hub.
     olm.skipRange: '>=1.2.0 <1.3.0'
     operatorframework.io/initialization-resource: '{"apiVersion":"operator.open-cluster-management.io/v1alpha4",
@@ -490,6 +490,7 @@ spec:
           - managedclusters
           verbs:
           - create
+          - delete
           - get
           - list
           - update

operator/config/rbac/role.yaml

@@ -206,6 +206,7 @@ rules:
   - managedclusters
   verbs:
   - create
+  - delete
   - get
   - list
   - update

operator/pkg/controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-clusterrole.yaml

@@ -247,4 +247,5 @@ rules:
   - get
   - create
   - update
+  - delete
 {{- end -}}

operator/pkg/controllers/hubofhubs/controller.go

@@ -563,7 +563,7 @@ func watchMutatingWebhookConfigurationPredicate() predicate.TypedPredicate[*admi
 // +kubebuilder:rbac:groups=cluster.open-cluster-management.io,resources=placements,verbs=create;get;list;patch;update;delete
 // +kubebuilder:rbac:groups=cluster.open-cluster-management.io,resources=managedclustersetbindings,verbs=create;get;list;patch;update;delete
 // +kubebuilder:rbac:groups=cluster.open-cluster-management.io,resources=managedclustersets,verbs=get;list;patch;update
-// +kubebuilder:rbac:groups=cluster.open-cluster-management.io,resources=managedclusters,verbs=get;list;update;create
+// +kubebuilder:rbac:groups=cluster.open-cluster-management.io,resources=managedclusters,verbs=get;list;update;create;delete
 // +kubebuilder:rbac:groups="",resources=namespaces,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

pkg/constants/constants.go

@@ -173,6 +173,8 @@ const (
 const (
 	// ManagedClusterMigrationFinalizer is the finalizer for managed cluster migration
 	ManagedClusterMigrationFinalizer = "global-hub.open-cluster-management.io/migration-cleanup"
+	// ManagedClusterMigrating is under migrating so the global hub agent ignore reporting the status for the cluster
+	ManagedClusterMigrating = "global-hub.open-cluster-management.io/migrating"
 	// cloudevent source for global hub
 	CloudEventSourceGlobalHub = "global-hub"
 	// cloudevent extension keys