Merge pull request #51 from projectsyn/fix-kapitan-call

Explicitly disable check mode for subprocess.run in kapitan_compile
projectsyn · Mar 4, 2020 · d9a5f57 · d9a5f57
2 parents bb936ba + 0d4f0a9
commit d9a5f57
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 35 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/commodore/compile.py b/commodore/compile.py
@@ -154,7 +154,7 @@ def compile(config, cluster_id):
 
     p = kapitan_compile()
     if p.returncode != 0:
-        raise click.ClickException(f"Catalog compilation failed")
+        raise click.ClickException(f"Kapitan catalog compilation failed.")
 
     postprocess_components(kapitan_inventory, target_name, config.get_components())
 

diff --git a/commodore/helpers.py b/commodore/helpers.py
@@ -93,7 +93,7 @@ def kapitan_compile():
     click.secho('Compiling catalog...', bold=True)
     return subprocess.run(  # nosec
         shlex.split('kapitan compile --fetch -J .  dependencies --refs-path ./catalog/refs'),
-        check=True)
+        check=False)
 
 
 def rm_tree_contents(basedir):