qontract-reconcile 0.10.1rc1116__py3-none-any.whl → 0.10.1rc1118__py3-none-any.whl

{qontract_reconcile-0.10.1rc1116.dist-info → qontract_reconcile-0.10.1rc1118.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1116
+Version: 0.10.1rc1118
 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.1rc1116.dist-info → qontract_reconcile-0.10.1rc1118.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=QuXVWIfLMasGDe_9f_IJnDSf-iHed10bv0S_x43YxXc,7771
+reconcile/change_owners/change_log_tracking.py,sha256=qEGSH3C6FUxmz-rPNyQCqwM8kYK3tNtHVgQHzQjIWh0,7814
 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=qdw4ZxOVbTzSATxmLUtJ9HA6BZXwxkHfQljrWv-Q8sU,18244
+reconcile/change_owners/changes.py,sha256=YblT-JPFagctTphzd38SjVmj3k1YsgMzN48zGpnLYKM,18222
 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
@@ -196,9 +196,9 @@ reconcile/external_resources/aws.py,sha256=7W-6d-lXO6JGwaxtO1Uc3Lw0p8csJ1EVgz__O
 reconcile/external_resources/factories.py,sha256=nhdTqf1WEfRfgd5-70KAUJVz0ZvZ19C3Pz7wmotSdrs,4857
 reconcile/external_resources/integration.py,sha256=y1gJ16woMBC3J9qniMmS5y3lCkAs7V_ETZRUwjKqaO0,6628
 reconcile/external_resources/integration_secrets_sync.py,sha256=cMEZhgCvABAMf-DWF051L6CRnJQdfbsISA_b1xuS940,1670
-reconcile/external_resources/manager.py,sha256=AvBYpC4p2BaGrxYEV1ut3V2FtJfs1h2z0Vk8Px6dCaQ,15641
+reconcile/external_resources/manager.py,sha256=cs6QEirz9EaLiuxybZ_1ugUn61vNWlKAC4NKouqpd5I,16148
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
-reconcile/external_resources/metrics.py,sha256=Ihhe39BX0h2w7eLvvdijJuCXjj-f7w1E3MfDL0YiGNU,668
+reconcile/external_resources/metrics.py,sha256=jsN3IF78Su23d3Qp4BTKXkgZPN6AKjdS8sZFEXmYCek,863
 reconcile/external_resources/model.py,sha256=UuQgrnv-SSkvSEQQGeCE2IZkhXjLTCVkP_mw8zBZsIQ,8349
 reconcile/external_resources/reconciler.py,sha256=3KFmkHsN7YAwJUSBpN1Xd_D2zM9Ea5_c2uMGWsfruZo,9707
 reconcile/external_resources/secrets_sync.py,sha256=6n0oDPLjd9Ql0lf6zsr1AZw8A6EEe3yCzl20XodtgkE,16229
@@ -261,7 +261,7 @@ reconcile/gql_definitions/common/clusters_with_peering.py,sha256=B1Hi3u6rZZsl4bD
 reconcile/gql_definitions/common/github_orgs.py,sha256=rZ0pDAA2_9hF9N-ykRZIxPtEmczTSjuA_k3nkp0k1W0,2039
 reconcile/gql_definitions/common/jira_settings.py,sha256=Fmjxhlhr69kc4jkG_0k17fuYlQVucbNex0jXYu83wbY,1990
 reconcile/gql_definitions/common/jiralert_settings.py,sha256=H96nMg_r2YcOvioj3aIkwqtFrALGSLt7uhbx9jGSUTo,1984
-reconcile/gql_definitions/common/namespaces.py,sha256=AmE6XSxGVKYUHjmWI8y2scHw1ya9EfTnEkvffzyRKDE,8922
+reconcile/gql_definitions/common/namespaces.py,sha256=HnNPJbrzbEknpX3e6l4wCmH6PawtwwSUbQCnbcq7x2s,11019
 reconcile/gql_definitions/common/namespaces_minimal.py,sha256=XVt8LFe-bGYbjN3ysX3b9sFGmLX4snQ_A9ZouQGaaAI,3429
 reconcile/gql_definitions/common/ocm_env_telemeter.py,sha256=jW0Q9WazDQVOxh4u0LMFG69rupBioJ8HGGjvR9bVK9Y,2424
 reconcile/gql_definitions/common/ocm_environments.py,sha256=6-_4Bf6-wBWykNBxVAFYnDkgM8sSoATKdabakDR9ENs,2018
@@ -869,8 +869,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.1rc1116.dist-info/METADATA,sha256=FuJrNLTiKxo9O9hatAzIX5lB3r7V_KZNiDDpnB1OuCw,2213
-qontract_reconcile-0.10.1rc1116.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1116.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1116.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1116.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1118.dist-info/METADATA,sha256=2jeVjBwwFsNDGFNPGxlQNAiSf5JMp9mD7IOhqYwQa8M,2213
+qontract_reconcile-0.10.1rc1118.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1118.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1118.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1118.dist-info/RECORD,,

reconcile/change_owners/change_log_tracking.py

@@ -18,8 +18,8 @@ from reconcile.change_owners.changes import (
     parse_bundle_changes,
 )
 from reconcile.typed_queries.apps import get_apps
-from reconcile.typed_queries.external_resources import get_namespaces
 from reconcile.typed_queries.jenkins import get_jenkins_configs
+from reconcile.typed_queries.namespaces import get_namespaces
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.gitlab_api import MRState
@@ -135,7 +135,9 @@ class ChangeLogIntegration(QontractReconcileIntegration[ChangeLogIntegrationPara
             diff = QontractServerDiff(**obj)
             changes = aggregate_resource_changes(
                 bundle_changes=aggregate_file_moves(parse_bundle_changes(diff)),
-                content_store={c.path: c.dict() for c in namespaces + jenkins_configs},
+                content_store={
+                    c.path: c.dict(by_alias=True) for c in namespaces + jenkins_configs
+                },
                 supported_schemas={
                     "/openshift/namespace-1.yml",
                     "/dependencies/jenkins-config-1.yml",

reconcile/change_owners/changes.py

@@ -10,7 +10,6 @@ from dataclasses import (
 from typing import Any
 
 import anymarkup
-import jsonpath_ng
 
 from reconcile.change_owners.bundle import (
     DATAFILE_PATH_FIELD_NAME,
@@ -473,7 +472,7 @@ def aggregate_resource_changes(
             new_content_sha="",
             diffs=[
                 Diff(
-                    path=jsonpath_ng.parse(file_ref.json_path),
+                    path=parse_jsonpath(file_ref.json_path),
                     diff_type=DiffType.CHANGED,
                     old=file_content,
                     new=file_content,

reconcile/external_resources/manager.py

@@ -16,6 +16,7 @@ from reconcile.external_resources.factories import (
 from reconcile.external_resources.metrics import (
     ExternalResourcesReconcileErrorsCounter,
     ExternalResourcesReconcileTimeGauge,
+    ExternalResourcesResourceStatus,
 )
 from reconcile.external_resources.model import (
     Action,
@@ -212,7 +213,7 @@ class ExternalResourcesManager:
         return to_reconcile
 
     def _update_in_progress_state(
-        self, r: Reconciliation, state: ExternalResourceState
+        self, r: Reconciliation, state: ExternalResourceState, job_name: str
     ) -> bool:
         """Gets the resource reconciliation state from the Job and updates the
         Resource state accordingly. It also returns if the target outputs secret needs
@@ -238,7 +239,6 @@ class ExternalResourcesManager:
 
         # Need to check the reconciliation set in the state, not the desired one
         # as the reconciliation object might be from a previous desired state
-        job_name = ReconciliationK8sJob(reconciliation=r).name()
         error = False
         match self.reconciler.get_resource_reconcile_status(state.reconciliation):
             case ReconcileStatus.SUCCESS:
@@ -291,7 +291,6 @@ class ExternalResourcesManager:
                     job_name=job_name,
                 )
             )
-
         return need_secret_sync
 
     def _update_state(self, r: Reconciliation, state: ExternalResourceState) -> None:
@@ -353,7 +352,8 @@ class ExternalResourcesManager:
         to_sync_keys: set[ExternalResourceKey] = set()
         for r in desired_r.union(deleted_r):
             state = self.state_mgr.get_external_resource_state(r.key)
-            need_sync = self._update_in_progress_state(r, state)
+            job_name = ReconciliationK8sJob(reconciliation=r).name()
+            need_sync = self._update_in_progress_state(r, state, job_name)
             if need_sync:
                 to_sync_keys.add(r.key)
 
@@ -361,6 +361,18 @@ class ExternalResourcesManager:
                 self.reconciler.reconcile_resource(reconciliation=r)
                 self._update_state(r, state)
 
+            metrics.set_gauge(
+                ExternalResourcesResourceStatus(
+                    provision_provider=r.key.provision_provider,
+                    provisioner_name=r.key.provisioner_name,
+                    provider=r.key.provider,
+                    identifier=r.key.identifier,
+                    job_name=job_name,
+                    status=state.resource_status,
+                ),
+                1,
+            )
+
         pending_sync_keys = self.state_mgr.get_keys_by_status(
             ResourceStatus.PENDING_SECRET_SYNC
         )

reconcile/external_resources/metrics.py

@@ -24,3 +24,11 @@ class ExternalResourcesReconcileTimeGauge(ExternalResourcesBaseMetric, GaugeMetr
     @classmethod
     def name(cls) -> str:
         return "external_resources_reconcile_time"
+
+
+class ExternalResourcesResourceStatus(ExternalResourcesBaseMetric, GaugeMetric):
+    status: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "external_resources_resource_status"

reconcile/gql_definitions/common/namespaces.py

@@ -48,6 +48,7 @@ fragment VaultSecret on VaultSecret_v1 {
 
 query Namespaces {
   namespaces: namespaces_v1 {
+    path
     name
     delete
     labels
@@ -60,6 +61,29 @@ query Namespaces {
         email
       }
     }
+    openshiftResources {
+        provider
+        ... on NamespaceOpenshiftResourceResource_v1 {
+          path {
+            content
+          }
+        }
+        ... on NamespaceOpenshiftResourceResourceTemplate_v1 {
+          path {
+            content
+          }
+        }
+        ... on NamespaceOpenshiftResourceRoute_v1 {
+          path {
+            content
+          }
+        }
+        ... on NamespaceOpenshiftResourcePrometheusRule_v1 {
+          path {
+            content
+          }
+        }
+    }
     managedExternalResources
     externalResources {
       provider
@@ -172,6 +196,42 @@ class AppV1(ConfiguredBaseModel):
     service_owners: Optional[list[OwnerV1]] = Field(..., alias="serviceOwners")
 
 
+class NamespaceOpenshiftResourceV1(ConfiguredBaseModel):
+    provider: str = Field(..., alias="provider")
+
+
+class ResourceV1(ConfiguredBaseModel):
+    content: str = Field(..., alias="content")
+
+
+class NamespaceOpenshiftResourceResourceV1(NamespaceOpenshiftResourceV1):
+    path: Optional[ResourceV1] = Field(..., alias="path")
+
+
+class NamespaceOpenshiftResourceResourceTemplateV1_ResourceV1(ConfiguredBaseModel):
+    content: str = Field(..., alias="content")
+
+
+class NamespaceOpenshiftResourceResourceTemplateV1(NamespaceOpenshiftResourceV1):
+    path: Optional[NamespaceOpenshiftResourceResourceTemplateV1_ResourceV1] = Field(..., alias="path")
+
+
+class NamespaceOpenshiftResourceRouteV1_ResourceV1(ConfiguredBaseModel):
+    content: str = Field(..., alias="content")
+
+
+class NamespaceOpenshiftResourceRouteV1(NamespaceOpenshiftResourceV1):
+    path: Optional[NamespaceOpenshiftResourceRouteV1_ResourceV1] = Field(..., alias="path")
+
+
+class NamespaceOpenshiftResourcePrometheusRuleV1_ResourceV1(ConfiguredBaseModel):
+    content: str = Field(..., alias="content")
+
+
+class NamespaceOpenshiftResourcePrometheusRuleV1(NamespaceOpenshiftResourceV1):
+    path: Optional[NamespaceOpenshiftResourcePrometheusRuleV1_ResourceV1] = Field(..., alias="path")
+
+
 class ExternalResourcesProvisionerV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
@@ -261,12 +321,14 @@ class ResourceQuotaV1(ConfiguredBaseModel):
 
 
 class NamespaceV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
     name: str = Field(..., alias="name")
     delete: Optional[bool] = Field(..., alias="delete")
     labels: Optional[Json] = Field(..., alias="labels")
     cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")
     managed_roles: Optional[bool] = Field(..., alias="managedRoles")
     app: AppV1 = Field(..., alias="app")
+    openshift_resources: Optional[list[Union[NamespaceOpenshiftResourceResourceV1, NamespaceOpenshiftResourceResourceTemplateV1, NamespaceOpenshiftResourceRouteV1, NamespaceOpenshiftResourcePrometheusRuleV1, NamespaceOpenshiftResourceV1]]] = Field(..., alias="openshiftResources")
     managed_external_resources: Optional[bool] = Field(..., alias="managedExternalResources")
     external_resources: Optional[list[Union[NamespaceTerraformProviderResourceAWSV1, NamespaceExternalResourceV1]]] = Field(..., alias="externalResources")
     cluster: ClusterV1 = Field(..., alias="cluster")