qontract-reconcile 0.10.1rc962__py3-none-any.whl → 0.10.1rc964__py3-none-any.whl

{qontract_reconcile-0.10.1rc962.dist-info → qontract_reconcile-0.10.1rc964.dist-info}/METADATA

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

@@ -448,14 +448,14 @@ reconcile/skupper_network/models.py,sha256=HEwlVKsbmMaKaaBGvITIiSYNEVdjwXVhLaOJg
 reconcile/skupper_network/reconciler.py,sha256=XS-1oKBr_1l3dYUAVqUH6gCHg1G5ZuOfY_7fgGVAiFA,9996
 reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO7XhAH15BHAcS9fk,1550
 reconcile/statuspage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/statuspage/atlassian.py,sha256=G43HG5Y9FdYu_oEG9-yRpSwH4d2UtAqL26mrarWsN94,18515
+reconcile/statuspage/atlassian.py,sha256=41uE77ZeV0M98k_xVmrXUQ33iVG8Lb3TwrWq2pRc84U,18617
 reconcile/statuspage/integration.py,sha256=hsazrQMceJbr61nEkJLxJbHhudTGtFuH0mlCo66-2ug,711
-reconcile/statuspage/page.py,sha256=tMXVnajU0r5V5_KGp3cL04eMLiDD2Kf4sIkao-L5puM,5217
+reconcile/statuspage/page.py,sha256=k2CeosPG3EhTMSD_OFGm7AfDNX7zqWiibhraYqIIklg,5257
 reconcile/statuspage/state.py,sha256=wjX9by5Yy7nobxiE-xNhf6GyNwMVATd0O37jBckJm5M,1591
 reconcile/statuspage/status.py,sha256=ZKagwWqv-_Xsr97cQGCkbtd2U7ipA_iPKdnoj6Z-Jpw,2777
 reconcile/statuspage/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/statuspage/integrations/components.py,sha256=49KHd_E9AdRvcEA6n75q1McZv2LfN-hRsW-WA7dgw9g,2651
-reconcile/statuspage/integrations/maintenances.py,sha256=gL8mn1SbCNMveoD0nmqc5b_gS9XxPsqLtqBxJeRAvbY,4202
+reconcile/statuspage/integrations/maintenances.py,sha256=lLhiVlSrVZONUxM8Cen-HJg1LcVILLGc1TaqjBhTuBc,4178
 reconcile/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-peUa-FsGUS-JLUFc,238
 reconcile/templates/email.yml.j2,sha256=OZgczNRgXPj2gVYTgwQyHAQrMGu7xp-e4W1rX19GcrU,690
@@ -661,7 +661,7 @@ reconcile/utils/gitlab_api.py,sha256=6ZU77wzwYKVbJcuXrG0ZMvAsB-_N9On84LQiT_yZdeE
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=IGhxzBcuebbapDKLseevEThSsxa_eDCPNpo3A4VnOS4,14066
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
-reconcile/utils/helm.py,sha256=qnXtw3nyKJqobSG4d6PtvulqToqiEGuXK5PbgfwSFHI,1942
+reconcile/utils/helm.py,sha256=d4WFxf6NFcNj0I2YWDvWxN5gK80o2Y12Ve05ky73FCc,2763
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=PMsX8UjJ2F59fXbbqREjLVdapYWznYTB8svFmpt39qA,1949
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -847,8 +847,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.1rc962.dist-info/METADATA,sha256=H2k1Pegpt_fHDM6NwGFWQasYZYX9bZodCUN6DNMAuoE,2262
-qontract_reconcile-0.10.1rc962.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc962.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc962.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc962.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc964.dist-info/METADATA,sha256=367Imo6Q12SFdMZIV639dRVY_wRabOcjCwrlsaDthWo,2262
+qontract_reconcile-0.10.1rc964.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc964.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc964.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc964.dist-info/RECORD,,

reconcile/statuspage/atlassian.py

@@ -1,5 +1,6 @@
 import logging
 import time
+from datetime import datetime
 from typing import (
     Any,
     Self,
@@ -414,8 +415,8 @@ class AtlassianStatusPageProvider:
         return StatusMaintenance(
             name=name_override or raw_maintenance.name,
             message=raw_maintenance.incident_updates[0].body,
-            schedule_start=raw_maintenance.scheduled_for,
-            schedule_end=raw_maintenance.scheduled_until,
+            schedule_start=datetime.fromisoformat(raw_maintenance.scheduled_for),
+            schedule_end=datetime.fromisoformat(raw_maintenance.scheduled_until),
             components=[
                 self._raw_component_to_status_component(c)
                 for c in raw_maintenance.components
@@ -470,8 +471,8 @@ class AtlassianStatusPageProvider:
         data = {
             "name": maintenance.name,
             "status": "scheduled",
-            "scheduled_for": maintenance.schedule_start,
-            "scheduled_until": maintenance.schedule_end,
+            "scheduled_for": maintenance.schedule_start.isoformat(),
+            "scheduled_until": maintenance.schedule_end.isoformat(),
             "body": maintenance.message,
             "scheduled_remind_prior": maintenance.announcements.remind_subscribers,
             "scheduled_auto_transition": True,

reconcile/statuspage/integrations/maintenances.py

@@ -55,7 +55,7 @@ class StatusPageMaintenancesIntegration(QontractReconcileIntegration[NoParams]):
         now = datetime.now(UTC)
         slack = slackapi_from_queries(QONTRACT_INTEGRATION, init_usergroups=False)
         for m in desired_state:
-            scheduled_start = datetime.fromisoformat(m.schedule_start)
+            scheduled_start = m.schedule_start
             if now <= scheduled_start <= now + timedelta(hours=1):
                 state_key = f"notifications/{m.name}"
                 if binding_state.state.exists(state_key):

reconcile/statuspage/page.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Self, cast
 
 from pydantic import BaseModel
@@ -128,8 +129,8 @@ class StatusMaintenance(BaseModel):
 
     name: str
     message: str
-    schedule_start: str
-    schedule_end: str
+    schedule_start: datetime
+    schedule_end: datetime
     components: list[StatusComponent]
     announcements: StatusMaintenanceAnnouncement
 

reconcile/utils/helm.py

@@ -1,4 +1,5 @@
 import json
+import os
 import tempfile
 from collections.abc import Iterable, Mapping
 from subprocess import (
@@ -30,6 +31,26 @@ 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)
+                cmd = [
+                    "helm",
+                    "dependency",
+                    "build",
+                    path,
+                ]
+                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()