From b7a3669681915f5a882da83b5df18a6708dc32fe Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Mon, 13 Feb 2023 22:13:22 +0100
Subject: [PATCH] Upgrade version;Disable git rebase/push

---
 ansible/roles/assets/tasks/main.yml            |  2 +-
 .../bootstrap/roles/metacluster/tasks/git.yml  | 18 +++++++++---------
 ansible/vars/metacluster.yml                   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ansible/roles/assets/tasks/main.yml b/ansible/roles/assets/tasks/main.yml
index ed3d916..d565b5c 100644
--- a/ansible/roles/assets/tasks/main.yml
+++ b/ansible/roles/assets/tasks/main.yml
@@ -23,7 +23,7 @@
 - import_tasks: dependencies.yml
 - import_tasks: k3s.yml
 - import_tasks: helm.yml
-- import_tasks: git.yml
+# - import_tasks: git.yml
 - import_tasks: manifests.yml
 - import_tasks: kubeadm.yml
 - import_tasks: containerimages.yml
diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml
index e10f19a..952dc84 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml
@@ -110,8 +110,8 @@
             - organization: mc
               body:
                 name: GitOps.Config
-                # auto_init: true
-                # default_branch: main
+                auto_init: true
+                default_branch: main
                 description: GitOps manifests
             - organization: wl
               body:
@@ -122,13 +122,13 @@
           loop_control:
             label: "{{ item.organization ~ '/' ~ item.body.name }}"
 
-        - name: Rebase/Push source gitops repository
-          ansible.builtin.shell:
-            cmd: |
-              git config --local http.sslVerify false
-              git remote set-url origin https://administrator:{{ vapp['metacluster.password'] | urlencode }}@git.{{ vapp['metacluster.fqdn'] }}/mc/GitOps.Config.git
-              git push
-            chdir: /opt/metacluster/git-repositories/gitops
+        # - name: Rebase/Push source gitops repository
+        #   ansible.builtin.shell:
+        #     cmd: |
+        #       git config --local http.sslVerify false
+        #       git remote set-url origin https://administrator:{{ vapp['metacluster.password'] | urlencode }}@git.{{ vapp['metacluster.fqdn'] }}/mc/GitOps.Config.git
+        #       git push
+        #     chdir: /opt/metacluster/git-repositories/gitops
 
       when: (gitea_existing_config.json is undefined) or (gitea_existing_config.json.data | length == 0)
 
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index 3d42ecf..ea3f137 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -56,7 +56,7 @@ components:
 
   argo-cd:
     helm:
-      version: 5.20.3  # (= ArgoCD v2.6.1)
+      version: 5.20.4  # (= ArgoCD v2.6.1)
       chart: argo/argo-cd
       parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
       chart_values: !unsafe |