qontract-reconcile 0.10.1rc988__py3-none-any.whl → 0.10.1rc990__py3-none-any.whl

{qontract_reconcile-0.10.1rc988.dist-info → qontract_reconcile-0.10.1rc990.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc988
+Version: 0.10.1rc990
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc988.dist-info → qontract_reconcile-0.10.1rc990.dist-info}/RECORD

@@ -664,7 +664,7 @@ reconcile/utils/gitlab_api.py,sha256=WfhLhOp3-cOwgptiCNPhWja74Lo41ZIlJ6HFSWaIDRw
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=NqxosFCInLy_dF_fcXnRYcZgsThedSyv_I3U8k2SLMg,14161
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
-reconcile/utils/helm.py,sha256=hdNOVz1FkEZU3Iv46_aaulnh-c40_De1ou40pMSmBiw,3777
+reconcile/utils/helm.py,sha256=Zmh9shdcUNJmiHIbBDkuUlk9T_Cg7uvWfw9c4St2n8E,3775
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -799,7 +799,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=yi9xG_QElJlJgQlr3ADLHNwaptZVYA3SzYdVxXPXq4s,84489
+reconcile/utils/saasherder/saasherder.py,sha256=sC48LMtbKW2Mhyql2VwTMEYHugCXI9imdz8yeYlq0dk,84729
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -850,8 +850,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc988.dist-info/METADATA,sha256=wMWHbGMjtgHC7JAUM-MwuZiA9BoxXhp4qpYaj_fe-No,2262
-qontract_reconcile-0.10.1rc988.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc988.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc988.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc988.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc990.dist-info/METADATA,sha256=gPHQgGX8QfVXyoDNJ5Lx-SBWvxs9-idwSy5huEDo0GE,2262
+qontract_reconcile-0.10.1rc990.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc990.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc990.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc990.dist-info/RECORD,,

reconcile/utils/helm.py

@@ -55,7 +55,7 @@ def do_template(
                                 "--repository-cache",
                                 repository_cache_dir,
                             ]
-                            run(cmd, capture_output=False, check=True)
+                            run(cmd, capture_output=True, check=True)
                     cmd = [
                         "helm",
                         "dependency",
@@ -66,7 +66,7 @@ def do_template(
                         "--repository-cache",
                         repository_cache_dir,
                     ]
-                    run(cmd, capture_output=False, check=True)
+                    run(cmd, capture_output=True, check=True)
             with tempfile.NamedTemporaryFile(
                 mode="w+", encoding="locale"
             ) as values_file:

reconcile/utils/saasherder/saasherder.py

@@ -969,11 +969,16 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 else True
             )
             consolidated_parameters = spec.parameters(adjust=False)
-            image = consolidated_parameters.get("image", {})
-            if isinstance(image, dict) and not image.get("tag"):
-                commit_sha = self._get_commit_sha(url, ref, github)
-                image_tag = commit_sha[:hash_length]
-                consolidated_parameters.setdefault("image", {})["tag"] = image_tag
+            commit_sha = self._get_commit_sha(url, ref, github)
+            image_tag = commit_sha[:hash_length]
+            image = consolidated_parameters.setdefault("image", {})
+            if isinstance(image, dict):
+                image.setdefault("tag", image_tag)
+            global_parameters = consolidated_parameters.setdefault("global", {})
+            if isinstance(global_parameters, dict):
+                image = global_parameters.setdefault("image", {})
+                if isinstance(image, dict):
+                    image.setdefault("tag", image_tag)
             resources = helm.template_all(
                 url=url,
                 path=path,