[ADD] Fixup: Multi master application set support

onesteinbv · Jun 13, 2024 · bdd72d2 · bdd72d2
1 parent c101f81
commit bdd72d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/argocd_deployer/data/application_set_template.xml b/argocd_deployer/data/application_set_template.xml
@@ -1,7 +1,7 @@
 <odoo>
     <record id="application_set_template_master" model="argocd.application.set.template">
         <field name="name">Master application set template - Do not change</field>
-        <field name="yaml">apiVersion: argoproj.io/v1alpha1
+        <field name="yaml">
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:

diff --git a/argocd_deployer/models/application_set.py b/argocd_deployer/models/application_set.py
@@ -257,7 +257,8 @@ def _format_commit_message(self, message):
         return message % self.name
 
     def _get_argocd_template(self):
-        master = self.env.ref("argocd_deployer.application_set_master")
+        self.ensure_one()
+        master = self.master_application_set_id or self
         replacements = {
             "{{.config.repository_url}}": master.repository_url or "" or "",
             "{{.config.branch}}": master.branch or "main",