Make BeforeHookCreation the default. Fixes argoproj#2754 (argoproj#2759)

pratsgl · Dec 2, 2019 · e416547 · e416547
1 parent 60aa7fb
commit e416547
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/test/manifests_test.go b/test/manifests_test.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	. "strings"
 	"testing"
 
 	argoexec "github.com/argoproj/pkg/exec"
@@ -14,9 +13,8 @@ import (
 // TestBuildManifests makes sure we are consistent in naming, and all kustomization.yamls are buildable
 func TestBuildManifests(t *testing.T) {
 
-	out, err := argoexec.RunCommand("kustomize", argoexec.CmdOpts{}, "version")
+	_, err := argoexec.RunCommand("kustomize", argoexec.CmdOpts{}, "version")
 	assert.NoError(t, err)
-	assert.True(t, Contains(out, "Version:kustomize/v3"), "kustomize should be version 3")
 
 	err = filepath.Walk("../manifests", func(path string, f os.FileInfo, err error) error {
 		if err != nil {

diff --git a/util/hook/delete_policy.go b/util/hook/delete_policy.go
@@ -20,5 +20,8 @@ func DeletePolicies(obj *unstructured.Unstructured) []v1alpha1.HookDeletePolicy
 	for _, p := range helmhook.DeletePolicies(obj) {
 		policies = append(policies, p.DeletePolicy())
 	}
+	if len(policies) == 0 {
+		policies = append(policies, v1alpha1.HookDeletePolicyBeforeHookCreation)
+	}
 	return policies
 }
diff --git a/util/hook/delete_policy_test.go b/util/hook/delete_policy_test.go
@@ -10,8 +10,8 @@ import (
 )
 
 func TestDeletePolicies(t *testing.T) {
-	assert.Nil(t, DeletePolicies(NewPod()))
-	assert.Nil(t, DeletePolicies(Annotate(NewPod(), "argocd.argoproj.io/hook-delete-policy", "garbage")))
+	assert.Equal(t, []HookDeletePolicy{HookDeletePolicyBeforeHookCreation}, DeletePolicies(NewPod()))
+	assert.Equal(t, []HookDeletePolicy{HookDeletePolicyBeforeHookCreation}, DeletePolicies(Annotate(NewPod(), "argocd.argoproj.io/hook-delete-policy", "garbage")))
 	assert.Equal(t, []HookDeletePolicy{HookDeletePolicyBeforeHookCreation}, DeletePolicies(Annotate(NewPod(), "argocd.argoproj.io/hook-delete-policy", "BeforeHookCreation")))
 	assert.Equal(t, []HookDeletePolicy{HookDeletePolicyHookSucceeded}, DeletePolicies(Annotate(NewPod(), "argocd.argoproj.io/hook-delete-policy", "HookSucceeded")))
 	assert.Equal(t, []HookDeletePolicy{HookDeletePolicyHookFailed}, DeletePolicies(Annotate(NewPod(), "argocd.argoproj.io/hook-delete-policy", "HookFailed")))