Address code review comments

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
argoproj · Dec 17, 2023 · 230db9b · 230db9b
1 parent f3874a6
commit 230db9b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -1117,7 +1117,6 @@ func (ctrl *ApplicationController) finalizeApplicationDeletion(app *appv1.Applic
 			return nil
 		}
 		logCtx.Infof("Successfully deleted %d resources", len(objs))
-		logCtx.Infof("Resource entries removed from undefined cluster")
 		app.UnSetCascadedDeletion()
 		return ctrl.updateFinalizers(app)
 	}

diff --git a/controller/hook.go b/controller/hook.go
@@ -118,6 +118,8 @@ func (ctrl *ApplicationController) cleanupPostDeleteHooks(liveObjs map[kube.Reso
 	healthOverrides := lua.ResourceHealthOverrides(resourceOverrides)
 
 	pendingDeletionCount := 0
+	aggregatedHealth := health.HealthStatusHealthy
+	var hooks []*unstructured.Unstructured
 	for _, obj := range liveObjs {
 		if !isPostDeleteHook(obj) {
 			continue
@@ -126,8 +128,15 @@ func (ctrl *ApplicationController) cleanupPostDeleteHooks(liveObjs map[kube.Reso
 		if err != nil {
 			return false, err
 		}
+		if health.IsWorse(aggregatedHealth, hookHealth.Status) {
+			aggregatedHealth = hookHealth.Status
+		}
+		hooks = append(hooks, obj)
+	}
+
+	for _, obj := range hooks {
 		for _, policy := range hook.DeletePolicies(obj) {
-			if policy == common.HookDeletePolicyHookFailed && hookHealth.Status == health.HealthStatusDegraded || policy == common.HookDeletePolicyHookSucceeded && hookHealth.Status == health.HealthStatusHealthy {
+			if policy == common.HookDeletePolicyHookFailed && aggregatedHealth == health.HealthStatusDegraded || policy == common.HookDeletePolicyHookSucceeded && aggregatedHealth == health.HealthStatusHealthy {
 				pendingDeletionCount++
 				if obj.GetDeletionTimestamp() != nil {
 					continue
@@ -139,6 +148,7 @@ func (ctrl *ApplicationController) cleanupPostDeleteHooks(liveObjs map[kube.Reso
 				}
 			}
 		}
+
 	}
 	if pendingDeletionCount > 0 {
 		logCtx.Infof("Waiting for %d post-delete hooks to be deleted", pendingDeletionCount)

diff --git a/docs/user-guide/resource_hooks.md b/docs/user-guide/resource_hooks.md
@@ -9,6 +9,8 @@ and after a Sync operation. Hooks can also be run if a Sync operation fails at a
 Kubernetes rolling update strategy.
 * Using a `PostSync` hook to run integration and health checks after a deployment.
 * Using a `SyncFail` hook to run clean-up or finalizer logic if a Sync operation fails. _`SyncFail` hooks are only available starting in v1.2_
+* Using a `PostDelete` hook to run clean-up or finalizer logic after an all Application resources are deleted. Please note that
+  `PostDelete` hooks are only deleted if delete policy matches to the aggregated deletion hooks status and not garbage collected after the application is deleted. 
 
 ## Usage