From 13f0eea33c655fe2f9d75ed7d212b096d75f93f1 Mon Sep 17 00:00:00 2001
From: Vargha Csongor <Culisa1023@gmail.com>
Date: Sat, 16 Mar 2024 12:25:13 +0100
Subject: [PATCH] fix zitadel deployment phases

---
 deployment/zitadel/cert-job.yaml         |  3 +++
 deployment/zitadel/cockroach-values.yaml |  4 +++-
 deployment/zitadel/kustomization.yaml    | 14 ++++++++++++++
 deployment/zitadel/secrets.yaml          |  4 ++--
 deployment/zitadel/values.yaml           |  3 +++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/deployment/zitadel/cert-job.yaml b/deployment/zitadel/cert-job.yaml
index b9350fb..f5409f6 100644
--- a/deployment/zitadel/cert-job.yaml
+++ b/deployment/zitadel/cert-job.yaml
@@ -3,6 +3,7 @@ kind: ServiceAccount
 metadata:
   name: zitadel-cert-creator
   annotations: 
+    argocd.argoproj.io/hook: Sync
     argocd.argoproj.io/sync-wave: "2"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -19,6 +20,7 @@ kind: RoleBinding
 metadata:
   name: zitadel-cert-creator
   annotations: 
+    argocd.argoproj.io/hook: Sync
     argocd.argoproj.io/sync-wave: "2"
 subjects:
   - kind: ServiceAccount
@@ -33,6 +35,7 @@ kind: Job
 metadata:
   name: create-zitadel-cert
   annotations: 
+    argocd.argoproj.io/hook: Sync
     argocd.argoproj.io/sync-wave: "2"
 spec:
   template:
diff --git a/deployment/zitadel/cockroach-values.yaml b/deployment/zitadel/cockroach-values.yaml
index a5463ba..4e231da 100644
--- a/deployment/zitadel/cockroach-values.yaml
+++ b/deployment/zitadel/cockroach-values.yaml
@@ -1,3 +1,5 @@
 tls:
   enabled: true
-  
\ No newline at end of file
+  
+annotations:
+  argocd.argoproj.io/hook: Sync
\ No newline at end of file
diff --git a/deployment/zitadel/kustomization.yaml b/deployment/zitadel/kustomization.yaml
index cd4f136..bbca7c8 100644
--- a/deployment/zitadel/kustomization.yaml
+++ b/deployment/zitadel/kustomization.yaml
@@ -32,6 +32,13 @@ patches:
       - op: add
         path: /metadata/annotations/argocd.argoproj.io~1sync-wave
         value: 3
+  - target:
+      name: zitadel-setup
+      kind: Job
+    patch: |
+      - op: add
+        path: /metadata/annotations/argocd.argoproj.io~1hook
+        value: Sync
   - target:
       name: zitadel-init
       kind: Job
@@ -39,3 +46,10 @@ patches:
       - op: add
         path: /metadata/annotations/argocd.argoproj.io~1sync-wave
         value: 3
+  - target:
+      name: zitadel-init
+      kind: Job
+    patch: |
+      - op: add
+        path: /metadata/annotations/argocd.argoproj.io~1hook
+        value: Sync
\ No newline at end of file
diff --git a/deployment/zitadel/secrets.yaml b/deployment/zitadel/secrets.yaml
index a343364..2dda748 100644
--- a/deployment/zitadel/secrets.yaml
+++ b/deployment/zitadel/secrets.yaml
@@ -3,7 +3,7 @@ kind: Secret
 metadata:
   name: zitadel-masterkey
   annotations:
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/hook: PreSync
   labels:
     secret-generator.cs.sap.com/enabled: "true"
 stringData: 
@@ -14,7 +14,7 @@ kind: Secret
 metadata:
   name: cockroach-auth
   annotations:
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/hook: PreSync
   labels:
     secret-generator.cs.sap.com/enabled: "true"
 stringData:
diff --git a/deployment/zitadel/values.yaml b/deployment/zitadel/values.yaml
index 1319c16..c59c3e0 100644
--- a/deployment/zitadel/values.yaml
+++ b/deployment/zitadel/values.yaml
@@ -18,8 +18,11 @@ zitadel:
   dbSslCaCrtSecret: db-cockroachdb-ca-secret
   dbSslAdminCrtSecret: db-cockroachdb-client-secret
   dbSslUserCrtSecret: db-cockroachdb-zitadel-secret
+
 annotations: 
   argocd.argoproj.io/sync-wave: "3"
+  argocd.argoproj.io/hook: Sync
+
 env:
   - name: ZITADEL_DATABASE_COCKROACH_USER_PASSWORD
     valueFrom: