qontract-reconcile 0.10.1rc1174__py3-none-any.whl → 0.10.1rc1176__py3-none-any.whl

{qontract_reconcile-0.10.1rc1174.dist-info → qontract_reconcile-0.10.1rc1176.dist-info}/METADATA

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

@@ -200,7 +200,7 @@ reconcile/external_resources/manager.py,sha256=fXUm09w-9FRWYfJAwtV4_td1UHNLzdoGh
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
 reconcile/external_resources/metrics.py,sha256=nMbyonGZEJDD1lYzpQY2eR9TNwvxYC4ZCcpi6wrExcM,1037
 reconcile/external_resources/model.py,sha256=H3elpiqehg_jACy28fGV5_77n8gKclVO77-7cfbaMNA,9178
-reconcile/external_resources/reconciler.py,sha256=Lhzg0O9Sw65KrCae-J14g9PV82xdp29O4jS_T5YNgEY,9661
+reconcile/external_resources/reconciler.py,sha256=K9QvbQCIOCuOHnPIxQE_P_jFtrkF3dGo8d_cCCh08Ys,8973
 reconcile/external_resources/secrets_sync.py,sha256=6n0oDPLjd9Ql0lf6zsr1AZw8A6EEe3yCzl20XodtgkE,16229
 reconcile/external_resources/state.py,sha256=z086bnIUTOkzFmQvS9rSAhFsM3Aw_9PLKHBACJ-0tQc,9690
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -702,7 +702,7 @@ reconcile/utils/oc.py,sha256=AjwQnzLxnMv0ML70GfjTHeYmiNsztI8kgXQF3N0Hvfw,66088
 reconcile/utils/oc_connection_parameters.py,sha256=7DiEGo--TJelfYoZXJFyTBPeTw9kXL3L58vy2fiJnes,9643
 reconcile/utils/oc_filters.py,sha256=Tz3OwtbUaYKmxENFls5CtPVzkZDeFXknw53dJe-wbT8,1382
 reconcile/utils/oc_map.py,sha256=U8cYhiaZsomkofzbIjVrl7E7crRxkS2JKsFpVeeHVE8,8964
-reconcile/utils/ocm_base_client.py,sha256=ntBCtm-njkGsI_wMpdLk5iLukbKz1zKNyo4rCWlKxFU,6427
+reconcile/utils/ocm_base_client.py,sha256=DFqm5Z_KqBC3WYzEJH4-Kt6Zow2OLtT0jpHmnhwbSHU,6694
 reconcile/utils/openshift_resource.py,sha256=ZyQ436YdV80nvKGPuzYyYLLJj8Abjnb3e_PsejxBTNM,24715
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
 reconcile/utils/output.py,sha256=xh2Not-Xm97KeRx_J5nc2PP5tDwpDLZBeCrWI0S-al4,2034
@@ -802,7 +802,7 @@ reconcile/utils/ocm/search_filters.py,sha256=jdj2sMGArcQrZLluzxeypPSbMFX_5zSE3AC
 reconcile/utils/ocm/service_log.py,sha256=RG1f0MMn6joKaRCAm2xveSJCavdOPP1BVo9FXecDxaI,2018
 reconcile/utils/ocm/sre_capability_labels.py,sha256=nqh0imrYczNeeeC7ZNX3pEwuAIVkKLTKZf0YHSPZYpE,1537
 reconcile/utils/ocm/status_board.py,sha256=fOuyzkykxU9Rr7zhW5VaY0Vkn8Ur-GxvElzb8No-DZg,2283
-reconcile/utils/ocm/subscriptions.py,sha256=6_blQPcgZYyy19WCFjYiolVk3O1jyNlK1yMqfkwK5sI,2536
+reconcile/utils/ocm/subscriptions.py,sha256=hehKXsDXIhnhqvWOuiYvx6y2FGq3zt0APGYj7WiBIdI,2765
 reconcile/utils/ocm/syncsets.py,sha256=9IQm1l5BodOVZa2OFbQmow3afmh4nXe5pn-CCJ5LxTI,1169
 reconcile/utils/ocm/upgrades.py,sha256=VSpW_B3ux7XZjnxV7klW2OjPYW8Wh0rN7snDuiN0q2c,4861
 reconcile/utils/rosa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -880,8 +880,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 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.1rc1174.dist-info/METADATA,sha256=nGXeRAgYgcd6_bkiscOuIN-r-nFHkwRnk3kMa1yd_wg,2213
-qontract_reconcile-0.10.1rc1174.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-qontract_reconcile-0.10.1rc1174.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1174.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1174.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1176.dist-info/METADATA,sha256=FO4VVCgyw7g9Ej_-qTU5yN7o37gXyNGXakWuCm-G49c,2213
+qontract_reconcile-0.10.1rc1176.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+qontract_reconcile-0.10.1rc1176.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1176.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1176.dist-info/RECORD,,

reconcile/external_resources/reconciler.py

@@ -21,6 +21,7 @@ from kubernetes.client import (
 from pydantic import BaseModel
 
 from reconcile.external_resources.model import (
+    Action,
     Reconciliation,
 )
 from reconcile.external_resources.state import ReconcileStatus
@@ -88,6 +89,75 @@ class ReconciliationK8sJob(K8sJob, BaseModel, frozen=True):
         }
 
     def job_spec(self) -> V1JobSpec:
+        job_container = V1Container(
+            name="job",
+            image=self.reconciliation.module_configuration.image_version,
+            image_pull_policy="Always",
+            env=[
+                V1EnvVar(
+                    name="DRY_RUN",
+                    value=str(self.is_dry_run),
+                ),
+                V1EnvVar(
+                    name="ACTION",
+                    value=self.reconciliation.action.value,
+                ),
+            ],
+            volume_mounts=[
+                V1VolumeMount(
+                    name="credentials",
+                    mount_path="/credentials",
+                    sub_path="credentials",
+                ),
+                V1VolumeMount(
+                    name="workdir",
+                    mount_path="/work",
+                ),
+                self.scripts_volume_mount("/inputs"),
+            ],
+        )
+        outputs_secret_container = V1Container(
+            name="outputs",
+            image=self.reconciliation.module_configuration.outputs_secret_image_version,
+            image_pull_policy="Always",
+            env=[
+                V1EnvVar(
+                    name="NAMESPACE",
+                    value_from=V1EnvVarSource(
+                        field_ref=V1ObjectFieldSelector(field_path="metadata.namespace")
+                    ),
+                ),
+                V1EnvVar(
+                    name="ACTION",
+                    value=self.reconciliation.action,
+                ),
+                V1EnvVar(
+                    name="DRY_RUN",
+                    value=str(self.is_dry_run),
+                ),
+            ],
+            volume_mounts=[
+                V1VolumeMount(
+                    name="credentials",
+                    mount_path="/.aws/credentials",
+                    sub_path="credentials",
+                ),
+                V1VolumeMount(
+                    name="workdir",
+                    mount_path="/work",
+                ),
+                self.scripts_volume_mount("/inputs"),
+            ],
+        )
+
+        # For delete actions, we don't need to run the outputs_secrets container
+        if self.reconciliation.action == Action.APPLY:
+            init_containers = [job_container]
+            containers = [outputs_secret_container]
+        else:
+            init_containers = []
+            containers = [job_container]
+
         return V1JobSpec(
             backoff_limit=0,
             active_deadline_seconds=self.reconciliation.module_configuration.reconcile_timeout_minutes
@@ -98,72 +168,8 @@ class ReconciliationK8sJob(K8sJob, BaseModel, frozen=True):
                     annotations=self.annotations(), labels=self.labels()
                 ),
                 spec=V1PodSpec(
-                    init_containers=[
-                        V1Container(
-                            name="job",
-                            image=self.reconciliation.module_configuration.image_version,
-                            image_pull_policy="Always",
-                            env=[
-                                V1EnvVar(
-                                    name="DRY_RUN",
-                                    value=str(self.is_dry_run),
-                                ),
-                                V1EnvVar(
-                                    name="ACTION",
-                                    value=self.reconciliation.action.value,
-                                ),
-                            ],
-                            volume_mounts=[
-                                V1VolumeMount(
-                                    name="credentials",
-                                    mount_path="/credentials",
-                                    sub_path="credentials",
-                                ),
-                                V1VolumeMount(
-                                    name="workdir",
-                                    mount_path="/work",
-                                ),
-                                self.scripts_volume_mount("/inputs"),
-                            ],
-                        )
-                    ],
-                    containers=[
-                        V1Container(
-                            name="outputs",
-                            image=self.reconciliation.module_configuration.outputs_secret_image_version,
-                            image_pull_policy="Always",
-                            env=[
-                                V1EnvVar(
-                                    name="NAMESPACE",
-                                    value_from=V1EnvVarSource(
-                                        field_ref=V1ObjectFieldSelector(
-                                            field_path="metadata.namespace"
-                                        )
-                                    ),
-                                ),
-                                V1EnvVar(
-                                    name="ACTION",
-                                    value=self.reconciliation.action,
-                                ),
-                                V1EnvVar(
-                                    name="DRY_RUN",
-                                    value=str(self.is_dry_run),
-                                ),
-                            ],
-                            volume_mounts=[
-                                V1VolumeMount(
-                                    name="credentials",
-                                    mount_path="/.aws/credentials",
-                                    sub_path="credentials",
-                                ),
-                                V1VolumeMount(
-                                    name="workdir",
-                                    mount_path="/work",
-                                ),
-                                self.scripts_volume_mount("/inputs"),
-                            ],
-                        )
-                    ],
+                    init_containers=init_containers,
+                    containers=containers,
                     image_pull_secrets=[V1LocalObjectReference(name="quay.io")],
                     volumes=[
                         V1Volume(

reconcile/utils/ocm/subscriptions.py

@@ -18,9 +18,12 @@ def get_subscriptions(
     subscriptions = {}
     chunk_size = 100
     for filter_chunk in filter.chunk_by("id", chunk_size, ignore_missing=True):
+        # Note, that pagination is currently broken.
+        # Each call will return a random order, meaning pages are not consistent.
+        # ALWAYS by default use "orderBy: id", as id has an index in the db.
         for subscription_dict in ocm_api.get_paginated(
             api_path="/api/accounts_mgmt/v1/subscriptions?fetchCapabilities=true&fetchLabels=true",
-            params={"search": filter_chunk.render()},
+            params={"search": filter_chunk.render(), "orderBy": "id"},
             max_page_size=chunk_size,
         ):
             try:

reconcile/utils/ocm_base_client.py

@@ -84,6 +84,11 @@ class OCMBaseClient:
         max_page_size: int = 100,
         max_pages: int | None = None,
     ) -> Generator[dict[str, Any], None, None]:
+        """
+        Note, that pagination is currently broken.
+        Each call will return a random order, meaning pages are not consistent.
+        ALWAYS by default try to use "orderBy: id", as id exists for every resource and has an index in the db.
+        """
         params_copy = {} if not params else params.copy()
         params_copy["size"] = max_page_size