From 1329b0470c8c23d61482001a55911e872fb222e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= <mikael.cluseau@gmail.com>
Date: Wed, 4 Oct 2023 21:22:03 +0200
Subject: [PATCH] more complex waves

---
 templates/etcd.yaml     |  2 ++
 templates/pre-sync.yaml | 37 ++++---------------------------------
 templates/sync.yaml     | 33 +++++++++++++++++++++++++++++++++
 values.yaml             |  6 ++++--
 4 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 templates/sync.yaml

diff --git a/templates/etcd.yaml b/templates/etcd.yaml
index e47f503..fe0133a 100644
--- a/templates/etcd.yaml
+++ b/templates/etcd.yaml
@@ -15,6 +15,8 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: etcd
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   replicas: 1
   selector:
diff --git a/templates/pre-sync.yaml b/templates/pre-sync.yaml
index fcea67e..5ab1481 100644
--- a/templates/pre-sync.yaml
+++ b/templates/pre-sync.yaml
@@ -1,8 +1,10 @@
+{{ if .Values.etcd.backup }}
+
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  generateName: wave-1-etcd-backup-
+  generateName: presync-wave-1-etcd-backup-
   annotations:
     argocd.argoproj.io/hook: PreSync
     argocd.argoproj.io/sync-wave: "1"
@@ -30,35 +32,4 @@ spec:
         persistentVolumeClaim:
           claimName: etcd-backups
 
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  generateName: wave-2-migrate-
-  annotations:
-    argocd.argoproj.io/hook: PreSync
-    argocd.argoproj.io/sync-wave: "2"
-spec:
-  backoffLimit: 3
-  template:
-    spec:
-      restartPolicy: Never
-      containers:
-      - name: migrate
-        image: {{ .Values.migrate.repo }}:{{ .Values.migrate.tag }}
-        volumeMounts:
-        - mountPath: /data
-          name: data
-          subPath: etcd
-        command:
-        - etcdctl
-        - --endpoints=http://etcd:2379
-        - snap
-        - save
-        - /data/snap-{{ now | unixEpoch }}
-
-      volumes:
-      - name: data
-        persistentVolumeClaim:
-          claimName: etcd-backups
-
+{{ end }}
diff --git a/templates/sync.yaml b/templates/sync.yaml
new file mode 100644
index 0000000..3963b15
--- /dev/null
+++ b/templates/sync.yaml
@@ -0,0 +1,33 @@
+{{ if .Values.migrate.tag }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  generateName: sync-wave-2-migrate-
+  annotations:
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/sync-wave: "2"
+spec:
+  backoffLimit: 3
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: migrate
+        image: {{ .Values.migrate.repo }}:{{ .Values.migrate.tag }}
+        volumeMounts:
+        - mountPath: /data
+          name: data
+          subPath: etcd
+        command:
+        - etcdctl
+        - --endpoints=http://etcd:2379
+        - snap
+        - save
+        - /data/snap-{{ now | unixEpoch }}
+
+      volumes:
+      - name: data
+        persistentVolumeClaim:
+          claimName: etcd-backups
+{{ end }}
diff --git a/values.yaml b/values.yaml
index e640070..8a7352c 100644
--- a/values.yaml
+++ b/values.yaml
@@ -8,10 +8,12 @@ app:
 
 migrate:
   repo: gitea.demos.novit.tech/demo/migrate
-  tag: v1
+  #tag: v1
+  #tag: v2
 
 etcd:
-  tag: v3.5.9
+  backup: false
+  tag: v3.5.8
   storage:
     class: local
     request: 1Gi