qontract-reconcile 0.10.1rc1100__py3-none-any.whl → 0.10.1rc1102__py3-none-any.whl

{qontract_reconcile-0.10.1rc1100.dist-info → qontract_reconcile-0.10.1rc1102.dist-info}/METADATA

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

@@ -161,10 +161,10 @@ reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
 reconcile/change_owners/bundle.py,sha256=h30fU-JmLH5a-rCAovpzTeTkkkgZztsZ5A2raee0YuU,5355
-reconcile/change_owners/change_log_tracking.py,sha256=aL-o6Lf2yYaA6dB5-Ays1HFDcAu3i2iErc4fEzXVM0Q,7399
+reconcile/change_owners/change_log_tracking.py,sha256=qfiUBneSuW6YlhNYN55d9bdg3MKbw-0erPnVvXdQY-s,7591
 reconcile/change_owners/change_owners.py,sha256=0HRJhDm0oW3uYJFgzynqA1gA0lbhalhSkmWOiQmr-NM,17062
 reconcile/change_owners/change_types.py,sha256=HEsoBduhcczAXZHwT26mr5sVPxtf8J6tsvjSDDI1ceI,32077
-reconcile/change_owners/changes.py,sha256=IO2va8RZ1UsC_iosQR7qiQir7UwGuMQfFwceoU0utCI,18162
+reconcile/change_owners/changes.py,sha256=qdw4ZxOVbTzSATxmLUtJ9HA6BZXwxkHfQljrWv-Q8sU,18244
 reconcile/change_owners/decision.py,sha256=iUJcIc_N_RqXIAY8D10RZqPMC2OinsHTMcqI6f6uylE,7606
 reconcile/change_owners/diff.py,sha256=0vyu29xCL24ZhUa7hqBni0NaxoCYRXLwvA-h8V23YQ4,9009
 reconcile/change_owners/implicit_ownership.py,sha256=6BehZvx4IjrphmOt_LLLk9_02Fl5BY5jd00Wuz_PBZk,4234
@@ -683,7 +683,7 @@ reconcile/utils/gitlab_api.py,sha256=C1nsHQKKybsmFdaG9vsItBjJm69ym4VWbqbKfAEf7oY
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
-reconcile/utils/helm.py,sha256=Zmh9shdcUNJmiHIbBDkuUlk9T_Cg7uvWfw9c4St2n8E,3775
+reconcile/utils/helm.py,sha256=kOPazkwVvyEK_F3uGs7A-EW8V_OFt3w58dzWTTh5AYU,3846
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -819,7 +819,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=6JE3WfpJKuAN1fdRKJb04L4zMfFHq5vdEwxLWt6yn64,85894
+reconcile/utils/saasherder/saasherder.py,sha256=5Zzh6Qaa0zE1w4J3E8VMfj1XrPOg0PVT0eYbI6m3Vl0,85926
 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
@@ -870,8 +870,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.1rc1100.dist-info/METADATA,sha256=iSFUR2jxjoi8WMlX4m6nDnwBwh8UvQCq8YHfo9_wBXo,2213
-qontract_reconcile-0.10.1rc1100.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1100.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1100.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1100.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1102.dist-info/METADATA,sha256=N1pR51ZhYmbxSv-gH0Kxln8oAzdUJiY2dLsdtDvTd6s,2213
+qontract_reconcile-0.10.1rc1102.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1102.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1102.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1102.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -134,8 +134,12 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
                 continue
             diff = QontractServerDiff(**obj)
             changes = aggregate_resource_changes(
-                aggregate_file_moves(parse_bundle_changes(diff)),
-                {c.path: c.dict() for c in namespaces + jenkins_configs},
+                bundle_changes=aggregate_file_moves(parse_bundle_changes(diff)),
+                content_store={c.path: c.dict() for c in namespaces + jenkins_configs},
+                supported_schemas={
+                    "/openshift/namespace-1.yml",
+                    "/dependencies/jenkins-config-1.yml",
+                },
             )
             for change in changes:
                 logging.debug(f"Processing change {change}")

reconcile/change_owners/changes.py

@@ -462,6 +462,7 @@ def parse_bundle_changes(
 def aggregate_resource_changes(
     bundle_changes: list[BundleFileChange],
     content_store: dict[str, Any],
+    supported_schemas: set[str],
 ) -> list[BundleFileChange]:
     resource_changes = [
         BundleFileChange(
@@ -481,7 +482,8 @@ def aggregate_resource_changes(
         )
         for change in bundle_changes
         for file_ref in change.old_backrefs | change.new_backrefs
-        if (file_content := content_store[file_ref.path])
+        if file_ref.schema in supported_schemas
+        and (file_content := content_store[file_ref.path])
     ]
 
     return bundle_changes + resource_changes

reconcile/utils/helm.py

@@ -110,10 +110,13 @@ def template_all(
     path: str,
     name: str,
     values: Mapping[str, Any],
+    ref: str | None,
     ssl_verify: bool = True,
 ) -> Iterable[Mapping[str, Any]]:
     with tempfile.TemporaryDirectory() as wd:
         git.clone(url, wd, depth=1, verify=ssl_verify)
+        if ref:
+            git.checkout(ref, wd)
         return yaml.safe_load_all(
             do_template(values=values, path=f"{wd}{path}", name=name)
         )

reconcile/utils/saasherder/saasherder.py

@@ -988,6 +988,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     image.setdefault("tag", image_tag)
             resources = helm.template_all(
                 url=url,
+                ref=commit_sha,
                 path=path,
                 name=resource_template_name,
                 values=consolidated_parameters,