fix(hooks): always remove finalizers

pkg/sync/doc.go

@@ -59,10 +59,11 @@ Hooks can be deleted in an automatic fashion using the annotation: argocd.argopr
 	    argocd.argoproj.io/hook: PostSync
 	    argocd.argoproj.io/hook-delete-policy: HookSucceeded
 
+Hook deletion policies are governed by sync success and failure. A successful sync operation requires all hooks to complete successfully. A sync will fail if _any_ hooks fail.
 The following policies define when the hook will be deleted.
 
-  - HookSucceeded - the hook resource is deleted after the hook succeeded (e.g. Job/Workflow completed successfully).
-  - HookFailed - the hook resource is deleted after the hook failed.
+  - HookSucceeded - the hook resource is deleted if the sync succeeds
+  - HookFailed - the hook resource is deleted if the sync fails.
   - BeforeHookCreation - any existing hook resource is deleted before the new one is created
 
 # Sync Waves

pkg/sync/helper_test.go

@@ -0,0 +1,84 @@
+package sync
+
+import (
+	"fmt"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/argoproj/gitops-engine/pkg/health"
+	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
+	"github.com/argoproj/gitops-engine/pkg/sync/hook"
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
+	testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing"
+)
+
+type resourceNameHealthOverride map[string]health.HealthStatusCode
+
+func (r resourceNameHealthOverride) GetResourceHealth(obj *unstructured.Unstructured) (*health.HealthStatus, error) {
+	if status, ok := r[obj.GetName()]; ok {
+		return &health.HealthStatus{Status: status, Message: "test"}, nil
+	}
+	return nil, nil
+}
+
+func getResourceResult(resources []synccommon.ResourceSyncResult, resourceKey kube.ResourceKey) *synccommon.ResourceSyncResult {
+	for _, res := range resources {
+		if res.ResourceKey == resourceKey {
+			return &res
+		}
+	}
+	return nil
+}
+
+func newHook(name string, hookType synccommon.HookType, deletePolicy synccommon.HookDeletePolicy) *unstructured.Unstructured {
+	obj := testingutils.NewPod()
+	obj.SetName(name)
+	obj.SetNamespace(testingutils.FakeArgoCDNamespace)
+	testingutils.Annotate(obj, synccommon.AnnotationKeyHook, string(hookType))
+	testingutils.Annotate(obj, synccommon.AnnotationKeyHookDeletePolicy, string(deletePolicy))
+	obj.SetFinalizers([]string{hook.HookFinalizer})
+	return obj
+}
+
+func withReplaceAnnotation(un *unstructured.Unstructured) *unstructured.Unstructured {
+	un.SetAnnotations(map[string]string{synccommon.AnnotationSyncOptions: synccommon.SyncOptionReplace})
+	return un
+}
+
+func withServerSideApplyAnnotation(un *unstructured.Unstructured) *unstructured.Unstructured {
+	un.SetAnnotations(map[string]string{synccommon.AnnotationSyncOptions: synccommon.SyncOptionServerSideApply})
+	return un
+}
+
+func withDisableServerSideApplyAnnotation(un *unstructured.Unstructured) *unstructured.Unstructured {
+	un.SetAnnotations(map[string]string{synccommon.AnnotationSyncOptions: synccommon.SyncOptionDisableServerSideApply})
+	return un
+}
+
+func withReplaceAndServerSideApplyAnnotations(un *unstructured.Unstructured) *unstructured.Unstructured {
+	un.SetAnnotations(map[string]string{synccommon.AnnotationSyncOptions: "Replace=true,ServerSideApply=true"})
+	return un
+}
+
+func withForceAnnotation(un *unstructured.Unstructured) *unstructured.Unstructured {
+	un.SetAnnotations(map[string]string{synccommon.AnnotationSyncOptions: synccommon.SyncOptionForce})
+	return un
+}
+
+func withForceAndReplaceAnnotations(un *unstructured.Unstructured) *unstructured.Unstructured {
+	un.SetAnnotations(map[string]string{synccommon.AnnotationSyncOptions: "Force=true,Replace=true"})
+	return un
+}
+
+func createNamespaceTask(namespace string) (*syncTask, error) {
+	nsSpec := &corev1.Namespace{TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: kube.NamespaceKind}, ObjectMeta: metav1.ObjectMeta{Name: namespace}}
+	unstructuredObj, err := kube.ToUnstructured(nsSpec)
+
+	task := &syncTask{phase: synccommon.SyncPhasePreSync, targetObj: unstructuredObj}
+	if err != nil {
+		return task, fmt.Errorf("failed to convert namespace spec to unstructured: %w", err)
+	}
+	return task, nil
+}