qontract-reconcile 0.10.1rc917__py3-none-any.whl → 0.10.1rc919__py3-none-any.whl

{qontract_reconcile-0.10.1rc917.dist-info → qontract_reconcile-0.10.1rc919.dist-info}/METADATA

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

@@ -61,7 +61,7 @@ reconcile/ocm_groups.py,sha256=CluPyvmwE5JOZS2HQSReC1sD8L1ChhnJlAg8lcwdtxc,3395
 reconcile/ocm_machine_pools.py,sha256=poGfITOCJEMwYAJpiuL8SytgTcBmGIKEZPgNGld80TY,16563
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=aLgyInt9oIWAg0XtCiwJRUSwdPx3masKV8kHzkyEEOQ,4282
-reconcile/openshift_base.py,sha256=1PFwTR_r1BQFsAcI8gmj6-UNmppyMVcQdwtZCDL0T6g,49667
+reconcile/openshift_base.py,sha256=MvydL1Qq6g_mex_EOWDFFuckt8VtE3LfHW0mhWkUJFs,49712
 reconcile/openshift_cluster_bots.py,sha256=eRPYZqWMKFNxLlSN0QG97V5t1iIESQ0BbGaiaQP5VB0,10940
 reconcile/openshift_clusterrolebindings.py,sha256=QfSy1Ik8eEY5XObc1Q4xyhqyErZenJmbPv_u9wcDNNo,5864
 reconcile/openshift_groups.py,sha256=wb_J5hvfpgS5RTeeZDPiQ_zvwbajGYysFNP603YNioE,9313
@@ -792,8 +792,8 @@ reconcile/utils/runtime/runner.py,sha256=PBfE_M4hTZKtyubg29AkMWlLi2KKyA74yItREtT
 reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
-reconcile/utils/saasherder/models.py,sha256=McvpJhwh-QfrNT76hekvx5U5Xq2Hp1Yt1XHTW2d3Cn8,5466
-reconcile/utils/saasherder/saasherder.py,sha256=ul6sRbgvxUSnrDZXwJQ9nnQumkpTERTLFBWuiIWlCUA,88241
+reconcile/utils/saasherder/models.py,sha256=7YEWw32GMEZFXdeayh7pLW0lO6mpPD8L6c2GZoFpIUE,6477
+reconcile/utils/saasherder/saasherder.py,sha256=sIMC9It_nBiV4tevbaoXygKt_ocuiNGsX2ZaohwfFYY,87534
 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=3gUIIIEv52Vx7-VgQ2FZYfCCrfqUv_5gw_TQ3mbLcTs,4666
@@ -844,8 +844,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.1rc917.dist-info/METADATA,sha256=9i8HABFSIkcnnT-zpqr2yfJeF9T7rzIQVADi3hQzMy4,2273
-qontract_reconcile-0.10.1rc917.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc917.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc917.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc917.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc919.dist-info/METADATA,sha256=1-faoxKb-anVWlJgQgYltAHFUKKsvF0WCwORjQ_H7Es,2273
+qontract_reconcile-0.10.1rc919.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc919.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc919.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc919.dist-info/RECORD,,

reconcile/openshift_base.py

@@ -401,12 +401,16 @@ def apply(
 
         try:
             oc.apply(namespace, annotated)
-        except (InvalidValueApplyError, RequestEntityTooLargeError):
+        except InvalidValueApplyError:
             oc.remove_last_applied_configuration(
                 namespace, resource_type, resource.name
             )
             oc.apply(namespace, annotated)
-        except (MetaDataAnnotationsTooLongApplyError, UnsupportedMediaTypeError):
+        except (
+            MetaDataAnnotationsTooLongApplyError,
+            UnsupportedMediaTypeError,
+            RequestEntityTooLargeError,
+        ):
             if not oc.get(
                 namespace, resource_type, resource.name, allow_not_found=True
             ):

reconcile/utils/saasherder/models.py

@@ -15,7 +15,9 @@ from reconcile.utils.saasherder.interfaces import (
     ManagedResourceName,
     SaasApp,
     SaasEnvironment,
+    SaasFile,
     SaasPipelinesProviders,
+    SaasResourceTemplate,
     SaasResourceTemplateTarget,
 )
 
@@ -208,21 +210,59 @@ class ImageAuth:
 
 @dataclass
 class TargetSpec:
-    saas_file_name: str
-    resource_template_name: str
+    saas_file: SaasFile
+    resource_template: SaasResourceTemplate
     target: SaasResourceTemplateTarget
-    cluster: str
-    namespace: str
-    managed_resource_types: Iterable[str]
-    managed_resource_names: Sequence[ManagedResourceName] | None
-    delete: bool
-    privileged: bool
     image_auth: ImageAuth
-    image_patterns: list[str]
-    url: str
-    path: str
-    provider: str
     hash_length: int
     parameters: dict[str, str]
     github: Github
     target_config_hash: str
+
+    @property
+    def saas_file_name(self) -> str:
+        return self.saas_file.name
+
+    @property
+    def managed_resource_types(self) -> Iterable[str]:
+        return self.saas_file.managed_resource_types
+
+    @property
+    def managed_resource_names(self) -> Sequence[ManagedResourceName] | None:
+        return self.saas_file.managed_resource_names
+
+    @property
+    def privileged(self) -> bool:
+        return bool(self.saas_file.cluster_admin)
+
+    @property
+    def image_patterns(self) -> list[str]:
+        return self.saas_file.image_patterns
+
+    @property
+    def resource_template_name(self) -> str:
+        return self.resource_template.name
+
+    @property
+    def url(self) -> str:
+        return self.resource_template.url
+
+    @property
+    def path(self) -> str:
+        return self.resource_template.path
+
+    @property
+    def provider(self) -> str:
+        return self.resource_template.provider or "openshift-template"
+
+    @property
+    def cluster(self) -> str:
+        return self.target.namespace.cluster.name
+
+    @property
+    def namespace(self) -> str:
+        return self.target.namespace.name
+
+    @property
+    def delete(self) -> bool:
+        return bool(self.target.delete)

reconcile/utils/saasherder/saasherder.py

@@ -1310,7 +1310,6 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         all_trigger_specs = self.get_saas_targets_config_trigger_specs(saas_file)
         # iterate over resource templates (multiple per saas_file)
         for rt in saas_file.resource_templates:
-            provider = rt.provider or "openshift-template"
             hash_length = rt.hash_length or self.hash_length
             resource_template_parameters = self._collect_parameters(rt)
             resource_template_secret_parameters = self._collect_secret_parameters(rt)
@@ -1344,26 +1343,15 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
 
                 specs.append(
                     TargetSpec(
-                        saas_file_name=saas_file.name,
-                        cluster=target.namespace.cluster.name,
-                        namespace=target.namespace.name,
-                        managed_resource_types=saas_file.managed_resource_types,
-                        managed_resource_names=saas_file.managed_resource_names,
-                        delete=bool(target.delete),
-                        privileged=bool(saas_file.cluster_admin),
+                        saas_file=saas_file,
+                        resource_template=rt,
+                        target=target,
                         # process_template options
-                        resource_template_name=rt.name,
                         image_auth=image_auth,
-                        url=rt.url,
-                        path=rt.path,
-                        provider=provider,
                         hash_length=hash_length,
-                        target=target,
                         parameters=consolidated_parameters,
                         github=github,
                         target_config_hash=digest,
-                        # check_image options
-                        image_patterns=saas_file.image_patterns,
                     )
                 )