feat: Namespace/CRD creation should happen before PreSync phase (argoproj#159)

Author: Alexander Matyushentsev

pkg/sync/sync_context.go

@@ -736,20 +736,27 @@ func (sc *syncContext) targetObjs() []*unstructured.Unstructured {
 	return objs
 }
 
+func isCRDOfGroupKind(group string, kind string, obj *unstructured.Unstructured) bool {
+	if kube.IsCRD(obj) {
+		crdGroup, ok, err := unstructured.NestedString(obj.Object, "spec", "group")
+		if err != nil || !ok {
+			return false
+		}
+		crdKind, ok, err := unstructured.NestedString(obj.Object, "spec", "names", "kind")
+		if err != nil || !ok {
+			return false
+		}
+		if group == crdGroup && crdKind == kind {
+			return true
+		}
+	}
+	return false
+}
+
 func (sc *syncContext) hasCRDOfGroupKind(group string, kind string) bool {
 	for _, obj := range sc.targetObjs() {
-		if kube.IsCRD(obj) {
-			crdGroup, ok, err := unstructured.NestedString(obj.Object, "spec", "group")
-			if err != nil || !ok {
-				continue
-			}
-			crdKind, ok, err := unstructured.NestedString(obj.Object, "spec", "names", "kind")
-			if err != nil || !ok {
-				continue
-			}
-			if group == crdGroup && crdKind == kind {
-				return true
-			}
+		if isCRDOfGroupKind(group, kind, obj) {
+			return true
 		}
 	}
 	return false

pkg/sync/sync_task.go

@@ -25,6 +25,22 @@ type syncTask struct {
 	message        string
 }
 
+// isDependsOn returns true if given task depends on current task and should be executed after
+func (t *syncTask) isDependsOn(other *syncTask) bool {
+	otherObj := other.obj()
+	thisGVK := t.obj().GroupVersionKind()
+	otherGVK := otherObj.GroupVersionKind()
+
+	if isCRDOfGroupKind(thisGVK.Group, thisGVK.Kind, otherObj) {
+		return true
+	}
+
+	if otherGVK.Group == "" && otherGVK.Kind == kube.NamespaceKind && otherObj.GetName() == t.obj().GetNamespace() {
+		return true
+	}
+	return false
+}
+
 func ternary(val bool, a, b string) string {
 	if val {
 		return a

pkg/sync/sync_tasks.go

@@ -74,6 +74,12 @@ func (s syncTasks) Less(i, j int) bool {
 	tA := s[i]
 	tB := s[j]
 
+	if tA.isDependsOn(tB) {
+		return false
+	} else if tB.isDependsOn(tA) {
+		return true
+	}
+
 	d := syncPhaseOrder[tA.phase] - syncPhaseOrder[tB.phase]
 	if d != 0 {
 		return d < 0

pkg/sync/sync_tasks_test.go

@@ -368,6 +368,65 @@ func TestSyncNamespaceAgainstCRD(t *testing.T) {
 	assert.Equal(t, syncTasks{namespace, crd}, unsorted)
 }
 
+func TestSyncTasksSort_NamespaceAndObjectInNamespace(t *testing.T) {
+	deployment := &syncTask{
+		phase: common.SyncPhasePreSync,
+		targetObj: &unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"kind": "Job",
+				"metadata": map[string]interface{}{
+					"namespace": "myNamespace",
+					"name":      "mySyncHookJob",
+				},
+			},
+		}}
+	namespace := &syncTask{
+		targetObj: &unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"kind": "Namespace",
+				"metadata": map[string]interface{}{
+					"name": "myNamespace",
+				},
+			},
+		},
+	}
+
+	unsorted := syncTasks{deployment, namespace}
+	sort.Sort(unsorted)
+
+	assert.Equal(t, syncTasks{namespace, deployment}, unsorted)
+}
+
+func TestSyncTasksSort_CRDAndCR(t *testing.T) {
+	crd := &syncTask{
+		phase: common.SyncPhasePreSync,
+		targetObj: &unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "apiextensions.k8s.io/v1",
+				"kind":       "CustomResourceDefinition",
+				"spec": map[string]interface{}{
+					"group": "argoproj.io",
+					"names": map[string]interface{}{
+						"kind": "Workflow",
+					},
+				},
+			},
+		}}
+	cr := &syncTask{
+		targetObj: &unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"kind":       "Workflow",
+				"apiVersion": "argoproj.io/v1",
+			},
+		},
+	}
+
+	unsorted := syncTasks{cr, crd}
+	sort.Sort(unsorted)
+
+	assert.Equal(t, syncTasks{crd, cr}, unsorted)
+}
+
 func Test_syncTasks_multiStep(t *testing.T) {
 	t.Run("Single", func(t *testing.T) {
 		tasks := syncTasks{{liveObj: Annotate(NewPod(), common.AnnotationSyncWave, "-1"), phase: common.SyncPhaseSync}}