From bc56423183a22b4749c057b7c9440292184dc9c1 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Mon, 6 Nov 2023 17:57:42 +0100
Subject: [PATCH] Added sync waves

---
 argocd/app-of-apps/test/Chart.lock              |  6 ------
 argocd/app-of-apps/test/Chart.yaml              |  6 +-----
 .../test/templates/applications.yaml            |  2 ++
 argocd/app-of-apps/test/values.yaml             | 17 ++++++++++++++++-
 4 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 argocd/app-of-apps/test/Chart.lock

diff --git a/argocd/app-of-apps/test/Chart.lock b/argocd/app-of-apps/test/Chart.lock
deleted file mode 100644
index a6ece77..0000000
--- a/argocd/app-of-apps/test/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: vso-crds
-  repository: file://../../vso-crds/test
-  version: 0.1.0
-digest: sha256:12c8671f8eae4ae564788a7d51247c70ba63a4fa80967aab41b83d4571ad5076
-generated: "2023-11-06T17:13:20.463744+01:00"
diff --git a/argocd/app-of-apps/test/Chart.yaml b/argocd/app-of-apps/test/Chart.yaml
index c1b76f2..4a3d644 100644
--- a/argocd/app-of-apps/test/Chart.yaml
+++ b/argocd/app-of-apps/test/Chart.yaml
@@ -2,8 +2,4 @@ apiVersion: v2
 name: app-of-apps
 description: Configuration chart for ArgoCD to monitor
 type: application
-version: 0.1.1
-dependencies:
-  - name: vso-crds
-    version: 0.1.0
-    repository: file://../../vso-crds/test
\ No newline at end of file
+version: 0.1.1
\ No newline at end of file
diff --git a/argocd/app-of-apps/test/templates/applications.yaml b/argocd/app-of-apps/test/templates/applications.yaml
index e5a5d86..e981e07 100644
--- a/argocd/app-of-apps/test/templates/applications.yaml
+++ b/argocd/app-of-apps/test/templates/applications.yaml
@@ -5,6 +5,8 @@ kind: Application
 metadata:
   name: {{ .name }}
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: {{ .syncWave | quote }}
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml
index f14dc01..8dc2e42 100644
--- a/argocd/app-of-apps/test/values.yaml
+++ b/argocd/app-of-apps/test/values.yaml
@@ -3,38 +3,51 @@ applications:
     project: default
     targetRevision: main
     namespace: hcloud
-    createNamespace: true
+    createNamespace: false
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: -1
+  - name: vso-crds
+    project: default
+    targetRevision: main
+    namespace: hcloud
+    createNamespace: false
+    repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: -1
   - name: configserver
     project: default
     targetRevision: main
     namespace: spring-support
     createNamespace: true
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: 2
   - name: kafka
     project: default
     targetRevision: main
     namespace: kafka
     createNamespace: true
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: 0
   - name: zookeeper
     project: default
     targetRevision: main
     namespace: kafka
     createNamespace: false
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: 0
   - name: wahlrecht
     project: default
     targetRevision: main
     namespace: wahlrecht
     createNamespace: true
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: 3
   - name: vault-secrets-operator
     project: default
     targetRevision: main
     namespace: vault-secrets-operator-system
     createNamespace: true
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: 0
   - name: prometheus
     project: default
     targetRevision: main
@@ -42,12 +55,14 @@ applications:
     createNamespace: true
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
     serverSideApply: true
+    syncWave: 0
   - name: prometheus-adapter
     project: default
     targetRevision: main
     namespace: observability
     createNamespace: false
     repoURL: https://git.2martens.de/2martens/cloud-configuration.git
+    syncWave: 1
 
 
 overall: