Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 01:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Alex Collins 2019-12-02 09:44:42 -08:00 committed by GitHub
parent 60aa7fb71e
commit e416547192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/manifests_test.go
View file

@ -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 {

3
util/hook/delete_policy.go
View file

@ -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
}

4
util/hook/delete_policy_test.go
View file

@ -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")))