Adds support for hook weight. Closes #1396

controller/sync_hooks.go

@@ -128,7 +128,10 @@ func (sc *syncContext) getHooks(hookTypes ...appv1.HookType) ([]*unstructured.Un
 			}
 		}
 		hooks = append(hooks, hook)
+
+		hook.GetAnnotations()
 	}
+
 	return hooks, nil
 }
 

test/testdata.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	"encoding/json"
+	"fmt"
 
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
@@ -45,12 +46,7 @@ var PodManifest = []byte(`
 `)
 
 func NewPod() *unstructured.Unstructured {
-	var un unstructured.Unstructured
-	err := json.Unmarshal(PodManifest, &un)
-	if err != nil {
-		panic(err)
-	}
-	return &un
+	return un(PodManifest)
 }
 
 var ServiceManifest = []byte(`
@@ -77,8 +73,12 @@ var ServiceManifest = []byte(`
 `)
 
 func NewService() *unstructured.Unstructured {
+	return un(ServiceManifest)
+}
+
+func un(bytes []byte) *unstructured.Unstructured {
 	var un unstructured.Unstructured
-	err := json.Unmarshal(ServiceManifest, &un)
+	err := json.Unmarshal(bytes, &un)
 	if err != nil {
 		panic(err)
 	}
@@ -127,12 +127,7 @@ var DeploymentManifest = []byte(`
 `)
 
 func NewDeployment() *unstructured.Unstructured {
-	var un unstructured.Unstructured
-	err := json.Unmarshal(DeploymentManifest, &un)
-	if err != nil {
-		panic(err)
-	}
-	return &un
+	return un(DeploymentManifest)
 }
 
 func DemoDeployment() *appsv1.Deployment {
@@ -213,3 +208,59 @@ func NewFakeProjLister(objects ...runtime.Object) applister.AppProjectNamespaceL
 	defer cancel()
 	return factory.Argoproj().V1alpha1().AppProjects().Lister().AppProjects(FakeArgoCDNamespace)
 }
+func NewHook() *unstructured.Unstructured {
+	return un([]byte(`{
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "name": "my-hook",
+    "annotations": {
+      "argocd.argoproj.io/hook": "PostSync",
+      "argocd.argoproj.io/hook-delete-policy": "HookSucceeded"
+	}
+  },
+  "spec": {
+    "restartPolicy": "Never",
+    "containers": [
+      {
+        "name": "main"
+      }
+    ],
+    "image": "alpine:latest",
+    "command": [
+      "sh",
+      "-c",
+      "sleep 10"
+    ]
+  }
+}`))
+}
+
+func NewHookWithWeight(hookWeight string) *unstructured.Unstructured {
+	return un([]byte(fmt.Sprintf(`{
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "name": "my-hook",
+	"annotations": {
+	  "argocd.argoproj.io/hook": "PostSync",
+	  "argocd.argoproj.io/hook-weight": "%s",
+	  "argocd.argoproj.io/hook-delete-policy": "HookSucceeded"
+    }
+  },
+  "spec": {
+    "restartPolicy": "Never",
+    "containers": [
+      {
+        "name": "main"
+      }
+    ],
+    "image": "alpine:latest",
+    "command": [
+      "sh",
+      "-c",
+      "sleep 10"
+    ]
+  }
+}`, hookWeight)))
+}

util/hook/hook.go

@@ -1,8 +1,10 @@
 package hook
 
 import (
+	"strconv"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"github.com/argoproj/argo-cd/common"
@@ -53,3 +55,21 @@ func IsArgoHook(obj *unstructured.Unstructured) bool {
 	}
 	return false
 }
+
+// IsArgoHook indicates if the supplied object is an Argo CD application lifecycle hook
+// (vs. a normal, synced application resource)
+func Weight(obj *unstructured.Unstructured) int {
+
+	text := obj.GetAnnotations()["argocd.argoproj.io/hook-weight"]
+
+	if text == "" {
+		return 0
+	}
+
+	hookWeight, err := strconv.Atoi(text)
+	if err != nil {
+		log.WithFields(log.Fields{"text": text, "err": err}).Warn("failed to convert hook weight, ignoring")
+	}
+
+	return hookWeight
+}

util/hook/hook_util.go → util/hook/hook_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"github.com/argoproj/argo-cd/test"
 )
@@ -30,3 +31,23 @@ func TestIsHook(t *testing.T) {
 	pod.SetAnnotations(map[string]string{"argocd.argoproj.io/hook": "Unknown"})
 	assert.False(t, IsHook(pod))
 }
+
+func TestWeight(t *testing.T) {
+	tests := []struct {
+		name string
+		obj  *unstructured.Unstructured
+		want int
+	}{
+		{"TestDefaultWeight", test.NewHook(), 0},
+		{"TestPositiveWeight", test.NewHookWithWeight("1"), 1},
+		{"TestNegativeWeight", test.NewHookWithWeight("-1"), -1},
+		{"TestGarbageWeight", test.NewHookWithWeight("foo"), 0},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := Weight(tt.obj); got != tt.want {
+				t.Errorf("Weight() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}