From 6b5374b2384ae71a6fc78f09e2d611ae1bae9f96 Mon Sep 17 00:00:00 2001
From: thepetk <thepetk@gmail.com>
Date: Thu, 29 Jan 2026 12:34:32 +0000
Subject: [PATCH] Introduce gitops sync waves

---
 .../gitops-template/components/http/base/configmap-app.yaml | 2 ++
 .../components/http/base/configmap-llama-stack-env.yaml     | 2 ++
 .../components/http/base/deployment-llama-stack.yaml        | 2 ++
 .../components/http/base/deployment-mcp-server.yaml         | 2 ++
 .../components/http/base/deployment-ollama.yaml             | 2 ++
 .../gitops-template/components/http/base/deployment.yaml    | 1 +
 .../gitops-template/components/http/base/pvc-ollama.yaml    | 2 ++
 .../components/http/base/rbac-mcp-server.yaml               | 6 ++++++
 skeleton/gitops-template/components/http/base/route.yaml    | 2 ++
 .../components/http/base/service-llama-stack.yaml           | 2 ++
 .../components/http/base/service-mcp-server.yaml            | 2 ++
 .../components/http/base/service-ollama.yaml                | 2 ++
 skeleton/gitops-template/components/http/base/service.yaml  | 2 ++
 13 files changed, 29 insertions(+)

diff --git a/skeleton/gitops-template/components/http/base/configmap-app.yaml b/skeleton/gitops-template/components/http/base/configmap-app.yaml
index e740fb6..fe24dd9 100644
--- a/skeleton/gitops-template/components/http/base/configmap-app.yaml
+++ b/skeleton/gitops-template/components/http/base/configmap-app.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   name: ${{ values.name }}-app-config
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
diff --git a/skeleton/gitops-template/components/http/base/configmap-llama-stack-env.yaml b/skeleton/gitops-template/components/http/base/configmap-llama-stack-env.yaml
index acd215c..3affeab 100644
--- a/skeleton/gitops-template/components/http/base/configmap-llama-stack-env.yaml
+++ b/skeleton/gitops-template/components/http/base/configmap-llama-stack-env.yaml
@@ -4,6 +4,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   name: ${{ values.name }}-llama-stack-env
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
diff --git a/skeleton/gitops-template/components/http/base/deployment-llama-stack.yaml b/skeleton/gitops-template/components/http/base/deployment-llama-stack.yaml
index f7500b5..047aa09 100644
--- a/skeleton/gitops-template/components/http/base/deployment-llama-stack.yaml
+++ b/skeleton/gitops-template/components/http/base/deployment-llama-stack.yaml
@@ -3,6 +3,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-llama-stack
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/deployment-mcp-server.yaml b/skeleton/gitops-template/components/http/base/deployment-mcp-server.yaml
index 463bc0e..69971dc 100644
--- a/skeleton/gitops-template/components/http/base/deployment-mcp-server.yaml
+++ b/skeleton/gitops-template/components/http/base/deployment-mcp-server.yaml
@@ -5,6 +5,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-mcp-server
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/deployment-ollama.yaml b/skeleton/gitops-template/components/http/base/deployment-ollama.yaml
index eb1aa84..72d5856 100644
--- a/skeleton/gitops-template/components/http/base/deployment-ollama.yaml
+++ b/skeleton/gitops-template/components/http/base/deployment-ollama.yaml
@@ -5,6 +5,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-ollama
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/deployment.yaml b/skeleton/gitops-template/components/http/base/deployment.yaml
index cbc9ea1..9d307a4 100644
--- a/skeleton/gitops-template/components/http/base/deployment.yaml
+++ b/skeleton/gitops-template/components/http/base/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: "3"
     tad.gitops.set/image: ".spec.template.spec.containers[0].image"
     tad.gitops.get/image: ".spec.template.spec.containers[0].image"
     tad.gitops.set/replicas: ".spec.replicas"
diff --git a/skeleton/gitops-template/components/http/base/pvc-ollama.yaml b/skeleton/gitops-template/components/http/base/pvc-ollama.yaml
index 937f450..25321f0 100644
--- a/skeleton/gitops-template/components/http/base/pvc-ollama.yaml
+++ b/skeleton/gitops-template/components/http/base/pvc-ollama.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-ollama
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/rbac-mcp-server.yaml b/skeleton/gitops-template/components/http/base/rbac-mcp-server.yaml
index 03cb9b4..271a84d 100644
--- a/skeleton/gitops-template/components/http/base/rbac-mcp-server.yaml
+++ b/skeleton/gitops-template/components/http/base/rbac-mcp-server.yaml
@@ -5,6 +5,8 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   name: ${{ values.name }}-mcp-sa
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
@@ -15,6 +17,8 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   name: ${{ values.name }}-mcp-reader
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
@@ -71,6 +75,8 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   name: ${{ values.name }}-mcp-reader-binding
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
diff --git a/skeleton/gitops-template/components/http/base/route.yaml b/skeleton/gitops-template/components/http/base/route.yaml
index 27a91b3..cb687bd 100644
--- a/skeleton/gitops-template/components/http/base/route.yaml
+++ b/skeleton/gitops-template/components/http/base/route.yaml
@@ -2,6 +2,8 @@
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "3"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/service-llama-stack.yaml b/skeleton/gitops-template/components/http/base/service-llama-stack.yaml
index b0c189b..934c171 100644
--- a/skeleton/gitops-template/components/http/base/service-llama-stack.yaml
+++ b/skeleton/gitops-template/components/http/base/service-llama-stack.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-llama-stack
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/service-mcp-server.yaml b/skeleton/gitops-template/components/http/base/service-mcp-server.yaml
index fd77505..761b5fa 100644
--- a/skeleton/gitops-template/components/http/base/service-mcp-server.yaml
+++ b/skeleton/gitops-template/components/http/base/service-mcp-server.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-mcp-server
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/service-ollama.yaml b/skeleton/gitops-template/components/http/base/service-ollama.yaml
index 14d32d2..67e7399 100644
--- a/skeleton/gitops-template/components/http/base/service-ollama.yaml
+++ b/skeleton/gitops-template/components/http/base/service-ollama.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}-ollama
     app.kubernetes.io/managed-by: kustomize
diff --git a/skeleton/gitops-template/components/http/base/service.yaml b/skeleton/gitops-template/components/http/base/service.yaml
index c64ac84..ea68324 100644
--- a/skeleton/gitops-template/components/http/base/service.yaml
+++ b/skeleton/gitops-template/components/http/base/service.yaml
@@ -2,6 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "3"
   labels:
     app.kubernetes.io/instance: ${{ values.name }}
     app.kubernetes.io/managed-by: kustomize