From 4d2513c1a51a87576298e8b3c85361199f9aba3b Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Tue, 7 Feb 2023 17:47:00 +0100
Subject: [PATCH] Adjust retries/delay;Upgrade version

---
 .../ansible_payload/bootstrap/roles/metacluster/tasks/k3s.yml   | 2 +-
 .../ansible_payload/upgrade/roles/metacluster/tasks/k3s.yml     | 2 +-
 .../ansible_payload/upgrade/roles/metacluster/tasks/storage.yml | 2 +-
 ansible/vars/metacluster.yml                                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/k3s.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/k3s.yml
index 11b4c97..7e904d1 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/k3s.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/k3s.yml
@@ -77,4 +77,4 @@
   until:
     - patch_result.changed is true
   retries: "{{ playbook.retries }}"
-  delay: "{{ playbook.delay.short }}"
+  delay: "{{ playbook.delay.medium }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/k3s.yml b/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/k3s.yml
index 12900a2..ec8c33b 100644
--- a/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/k3s.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/k3s.yml
@@ -77,4 +77,4 @@
   until:
     - patch_result.changed is true
   retries: "{{ playbook.retries }}"
-  delay: "{{ playbook.delay.short }}"
+  delay: "{{ playbook.delay.medium }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml b/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml
index 2d89010..07badf7 100644
--- a/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml
@@ -24,7 +24,7 @@
         - volume_details.json is defined
         - (volume_details.json | json_query('data[? state==`attached`].robustness') | unique | length) == 1
         - (volume_details.json | json_query('data[? state==`attached`].robustness') | first) == "healthy"
-      retries: "{{ playbook.retries }}"
+      retries: "{{ ( playbook.retries * 2) | int }}"
       delay: "{{ playbook.delay.long }}"
 
     - name: Upgrade longhorn chart
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index cc58998..cbdf557 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -54,7 +54,7 @@ components:
 
   argo-cd:
     helm:
-      version: 5.19.14  # (= ArgoCD v2.5.10)
+      version: 5.20.0  # (= ArgoCD v2.6.0)
       chart: argo/argo-cd
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
       chart_values: !unsafe |