Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
  • Loading branch information
coleenquadros committed Jul 22, 2024
1 parent f6a31ab commit 639dda8
Showing 1 changed file with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,9 @@ func (r *PlacementRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reques
latestClusters = append(latestClusters, addon.Namespace)
staleAddons = append(staleAddons, addon.Namespace)
}

for _, work := range workList.Items {
if work.Name != work.Namespace+workNameSuffix || work.Namespace == "local-cluster" {
if work.Name != work.Namespace+workNameSuffix {
// ACM 8509: Special case for hub metrics collector
// In the upgrade case we want to clean up the obs add on and manifest work that was created
// for local-cluster before the upgrade that is why we check for the local-cluster namespace
Expand All @@ -250,16 +251,15 @@ func (r *PlacementRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reques
if err != nil {
return ctrl.Result{}, err
}
} else {
if !slices.Contains(latestClusters, work.Namespace) {
reqLogger.Info("To delete manifestwork", "namespace", work.Namespace)
err = deleteManagedClusterRes(r.Client, work.Namespace)
if err != nil {
return ctrl.Result{}, err
}
} else {
staleAddons = commonutil.Remove(staleAddons, work.Namespace)
}
if !slices.Contains(latestClusters, work.Namespace) {
reqLogger.Info("To delete manifestwork", "namespace", work.Namespace)
err = deleteManagedClusterRes(r.Client, work.Namespace)
if err != nil {
return ctrl.Result{}, err
}
} else {
staleAddons = commonutil.Remove(staleAddons, work.Namespace)
}
}

Expand Down Expand Up @@ -296,7 +296,7 @@ func (r *PlacementRuleReconciler) Reconcile(ctx context.Context, req ctrl.Reques

if deleteAll {
// delete managedclusteraddon for local-cluster
err = deleteManagedClusterRes(r.Client, localClusterName)
err = deleteManagedClusterRes(r.Client, config.GetDefaultNamespace())
if err != nil {
return ctrl.Result{}, err
}
Expand Down

0 comments on commit 639dda8

Please sign in to comment.