make apps in single layer

ansible/roles/components/templates/argocd-vars.yaml.j2

@@ -21,7 +21,7 @@ configs:
 controller:
   env:
     - name: ARGOCD_SYNC_WAVE_DELAY
-      value: "30"
+      value: "5"
 
 redis:
   enabled: false

manifest/basement/application.yaml

@@ -4,7 +4,7 @@ metadata:
   name: basement-applications
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "-300"
+    argocd.argoproj.io/sync-wave: "-390"
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

manifest/basement/kustomization.yaml

@@ -1,7 +1,2 @@
 resources:
-  - ./hnc/application.yaml
-  - ./metrics-server/application.yaml
-  - ./reloader/application.yaml
-  - ./system-rbac/application.yaml
-
   - ./hierarchy.yaml

manifest/infrastructure/application.yaml

@@ -4,7 +4,7 @@ metadata:
   name: infrastructure-applications
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "-200"
+    argocd.argoproj.io/sync-wave: "-290"
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

manifest/infrastructure/argocd/env/common/argocd-controller.yaml

@@ -1,7 +1,7 @@
 controller:
   env:
     - name: ARGOCD_SYNC_WAVE_DELAY
-      value: "30"
+      value: "5"
   metrics:
     enabled: true
     serviceMonitor:

manifest/infrastructure/kustomization.yaml

@@ -1,10 +1,2 @@
 resources:
-  - ./cilium/application.yaml
-  - ./argocd/application.yaml
-  - ./rook-ceph/application.yaml
-  - ./traefik/application.yaml
-  - ./forward-auth/application.yaml
-  - ./cert-manager/application.yaml
-  - ./dex/application.yaml
-
   - ./hierarchy.yaml

manifest/kustomization.yaml

@@ -1,5 +1,25 @@
 resources:
   - ./basement/application.yaml
+  - ./basement/hnc/application.yaml
+  - ./basement/metrics-server/application.yaml
+  - ./basement/reloader/application.yaml
+  - ./basement/system-rbac/application.yaml
+
   - ./infrastructure/application.yaml
+  - ./infrastructure/cert-manager/application.yaml
+  - ./infrastructure/cilium/application.yaml
+  - ./infrastructure/traefik/application.yaml
+  - ./infrastructure/rook-ceph/application.yaml
+  - ./infrastructure/dex/application.yaml
+  - ./infrastructure/argocd/application.yaml
+  - ./infrastructure/forward-auth/application.yaml
+
   - ./monitoring/application.yaml
+  - ./monitoring/dashboard/application.yaml
+  - ./monitoring/prometheus-stack/application.yaml
+
   - ./user/application.yaml
+  - ./user/postgres/application.yaml
+  - ./user/redis/application.yaml
+  - ./user/scoreserver/main/application.yaml
+  - ./user/scoreserver/sub/application.yaml

manifest/monitoring/application.yaml

@@ -4,7 +4,7 @@ metadata:
   name: monitoring-applications
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "-100"
+    argocd.argoproj.io/sync-wave: "-190"
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

manifest/monitoring/kustomization.yaml

@@ -1,5 +1,2 @@
 resources:
-  - ./dashboard/application.yaml
-  - ./prometheus-stack/application.yaml
-
   - ./hierarchy.yaml

manifest/user/application.yaml

@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: user-applications
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "-90"
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:

manifest/user/kustomization.yaml

@@ -1,6 +1,2 @@
 resources:
   - ./hierarchy.yaml
-  - ./postgres/application.yaml
-  - ./redis/application.yaml
-  - ./scoreserver/main/application.yaml
-  - ./scoreserver/sub/application.yaml