qontract-reconcile 0.10.1rc980__py3-none-any.whl → 0.10.1rc982__py3-none-any.whl

{qontract_reconcile-0.10.1rc980.dist-info → qontract_reconcile-0.10.1rc982.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc980
+Version: 0.10.1rc982
 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.1rc980.dist-info → qontract_reconcile-0.10.1rc982.dist-info}/RECORD

@@ -665,7 +665,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=QpT8jxnA8VY0-tDU45LusB4Fzv22hlxxA0lH0G9_9Fk,2773
+reconcile/utils/helm.py,sha256=LuxRvL-N9tOWdluphk_B_Ulwuk2nWYcD_RzZcI-hY2A,3373
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -693,7 +693,7 @@ reconcile/utils/pagerduty_api.py,sha256=_24i9S_4X7nlvHb-7clXRE0p1BG4ODjOzKxWO-F9
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
 reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs,3832
-reconcile/utils/promotion_state.py,sha256=drkR0PSzfsUVPB0pisARzvUfHgk8KPbeK4FUZdP099Y,3894
+reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
 reconcile/utils/promtool.py,sha256=UmBfTHgW9Ys7fZ9BfhIVJEFGLkbge9y1AgL5PNHp7iA,2831
 reconcile/utils/quay_api.py,sha256=wyPD9F1do0FsAcmIr7RejUOs4zaKs8-OUylxI3MLk8A,7860
 reconcile/utils/raw_github_api.py,sha256=O6Q4vq7bi5ZWcfquPutc9rJ4Ef8_sFqd_RLgzpIoj0w,2920
@@ -851,8 +851,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.1rc980.dist-info/METADATA,sha256=P-UqVuzizwNTstf7_YiCVv-LPydPyyoGVYV_Bcdl-Oc,2262
-qontract_reconcile-0.10.1rc980.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc980.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc980.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc980.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc982.dist-info/METADATA,sha256=wOB0k60EKCZ43HHIbjLgVg-jByLkqU3oxnVMeD6k95A,2262
+qontract_reconcile-0.10.1rc982.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc982.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc982.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc982.dist-info/RECORD,,

reconcile/utils/helm.py

@@ -31,39 +31,52 @@ def do_template(
     name: str,
 ) -> str:
     try:
-        with open(os.path.join(path, "Chart.yaml"), encoding="locale") as chart_file:
-            chart = yaml.safe_load(chart_file)
-            if dependencies := chart.get("dependencies"):
-                for dep in dependencies:
-                    if repo := dep.get("repository"):
-                        cmd = [
-                            "helm",
-                            "repo",
-                            "add",
-                            dep["name"],
-                            repo,
-                        ]
-                        run(cmd, capture_output=False, check=True)
+        with tempfile.NamedTemporaryFile(
+            mode="w+", encoding="locale"
+        ) as repositories_file:
+            with open(
+                os.path.join(path, "Chart.yaml"), encoding="locale"
+            ) as chart_file:
+                chart = yaml.safe_load(chart_file)
+                if dependencies := chart.get("dependencies"):
+                    for dep in dependencies:
+                        if repo := dep.get("repository"):
+                            cmd = [
+                                "helm",
+                                "repo",
+                                "add",
+                                dep["name"],
+                                repo,
+                                "--repository-config",
+                                repositories_file.name,
+                            ]
+                            run(cmd, capture_output=False, check=True)
+                    cmd = [
+                        "helm",
+                        "dependency",
+                        "build",
+                        path,
+                        "--repository-config",
+                        repositories_file.name,
+                    ]
+                    run(cmd, capture_output=False, check=True)
+            with tempfile.NamedTemporaryFile(
+                mode="w+", encoding="locale"
+            ) as values_file:
+                values_file.write(json.dumps(values, cls=JSONEncoder))
+                values_file.flush()
                 cmd = [
                     "helm",
-                    "dependency",
-                    "build",
+                    "template",
                     path,
+                    "-n",
+                    name,
+                    "-f",
+                    values_file.name,
+                    "--repository-config",
+                    repositories_file.name,
                 ]
-                run(cmd, capture_output=False, check=True)
-        with tempfile.NamedTemporaryFile(mode="w+", encoding="locale") as values_file:
-            values_file.write(json.dumps(values, cls=JSONEncoder))
-            values_file.flush()
-            cmd = [
-                "helm",
-                "template",
-                path,
-                "-n",
-                name,
-                "-f",
-                values_file.name,
-            ]
-            result = run(cmd, capture_output=True, check=True)
+                result = run(cmd, capture_output=True, check=True)
     except CalledProcessError as e:
         msg = f'Error running helm template [{" ".join(cmd)}]'
         if e.stdout:

reconcile/utils/promotion_state.py

@@ -95,7 +95,10 @@ class PromotionState:
         if use_cache and path_v2 in self._promotion_data_cache:
             return self._promotion_data_cache[path_v2]
 
-        data = self._state.get(path_v2)
+        data = self._state.get(path_v2, None)
+        if not data:
+            return None
+
         promotion_data = PromotionData(**data)
         self._promotion_data_cache[path_v2] = promotion_data
         return promotion_data