qontract-reconcile 0.10.2.dev40__tar.gz → 0.10.2.dev42__tar.gz

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev40
+Version: 0.10.2.dev42
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/external_resources/model.py

@@ -18,6 +18,7 @@ from reconcile.gql_definitions.external_resources.external_resources_modules imp
     ExternalResourcesModuleV1,
 )
 from reconcile.gql_definitions.external_resources.external_resources_namespaces import (
+    ExternalResourcesModuleOverridesV1,
     NamespaceTerraformProviderResourceAWSV1,
     NamespaceTerraformResourceElastiCacheV1,
     NamespaceTerraformResourceKMSV1,
@@ -28,10 +29,6 @@ from reconcile.gql_definitions.external_resources.external_resources_namespaces
 from reconcile.gql_definitions.external_resources.external_resources_settings import (
     ExternalResourcesSettingsV1,
 )
-from reconcile.gql_definitions.external_resources.fragments.external_resources_module_overrides import (
-    ExternalResourcesModuleOverrides,
-)
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
 from reconcile.utils.exceptions import FetchResourceError
 from reconcile.utils.external_resource_spec import (
     ExternalResourceSpec,
@@ -223,38 +220,6 @@ def load_module_inventory(
     })
 
 
-class ResourcesSpec(BaseModel, frozen=True):
-    cpu: str | None = None
-    memory: str | None = None
-
-
-class Resources(BaseModel, frozen=True):
-    """Hashable class to store module resources in reconciliations.
-    Default values are used as a fallback for existent objects that were
-    created without container resources, hence they don't have mem/cpu resources
-    in the ERv2 State. Eventually, all resources will have resources assignments
-    from the module spec, module_overrides, or app-interface settings.
-    """
-
-    requests: ResourcesSpec = ResourcesSpec()
-    limits: ResourcesSpec = ResourcesSpec()
-
-    @staticmethod
-    def from_deploy_resources_fields(fields: DeployResourcesFields) -> "Resources":
-        """Create Resource obect from GQL DeployResourcesFields.
-
-        DeployResourceFields can not be used directly as it not hashable."""
-        return Resources(
-            requests=ResourcesSpec(
-                cpu=fields.requests.cpu, memory=fields.requests.memory
-            ),
-            limits=ResourcesSpec(
-                cpu=fields.limits.cpu,
-                memory=fields.limits.memory,
-            ),
-        )
-
-
 class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
     image: str = ""
     version: str = ""
@@ -262,7 +227,6 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
     reconcile_timeout_minutes: int = -1000
     outputs_secret_image: str = ""
     outputs_secret_version: str = ""
-    resources: Resources = Resources()
 
     @property
     def image_version(self) -> str:
@@ -280,14 +244,13 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
     ) -> "ExternalResourceModuleConfiguration":
         module_overrides = spec.metadata.get(
             "module_overrides"
-        ) or ExternalResourcesModuleOverrides(
+        ) or ExternalResourcesModuleOverridesV1(
             module_type=None,
             image=None,
             version=None,
             reconcile_timeout_minutes=None,
             outputs_secret_image=None,
             outputs_secret_version=None,
-            resources=None,
         )
 
         return ExternalResourceModuleConfiguration(
@@ -302,11 +265,6 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
             outputs_secret_version=module_overrides.outputs_secret_version
             or module.outputs_secret_version
             or settings.outputs_secret_version,
-            resources=Resources.from_deploy_resources_fields(
-                module_overrides.resources
-                or module.resources
-                or settings.module_default_resources
-            ),
         )
 
 

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/external_resources/reconciler.py

@@ -14,7 +14,6 @@ from kubernetes.client import (
     V1ObjectMeta,
     V1PodSpec,
     V1PodTemplateSpec,
-    V1ResourceRequirements,
     V1SecretVolumeSource,
     V1Volume,
     V1VolumeMount,
@@ -90,19 +89,10 @@ class ReconciliationK8sJob(K8sJob, BaseModel, frozen=True):
         }
 
     def job_spec(self) -> V1JobSpec:
-        assert self.reconciliation.module_configuration.resources is not None
         job_container = V1Container(
             name="job",
             image=self.reconciliation.module_configuration.image_version,
             image_pull_policy="Always",
-            resources=V1ResourceRequirements(
-                requests=self.reconciliation.module_configuration.resources.requests.dict(
-                    exclude_none=True
-                ),
-                limits=self.reconciliation.module_configuration.resources.limits.dict(
-                    exclude_none=True
-                ),
-            ),
             env=[
                 V1EnvVar(
                     name="DRY_RUN",
@@ -112,12 +102,6 @@ class ReconciliationK8sJob(K8sJob, BaseModel, frozen=True):
                     name="ACTION",
                     value=self.reconciliation.action.value,
                 ),
-                V1EnvVar(
-                    name="RECONCILE_TIMEOUT_MINUTES",
-                    value=str(
-                        self.reconciliation.module_configuration.reconcile_timeout_minutes
-                    ),
-                ),
             ],
             volume_mounts=[
                 V1VolumeMount(

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/external_resources/state.py

@@ -11,8 +11,6 @@ from reconcile.external_resources.model import (
     ExternalResourceModuleConfiguration,
     Reconciliation,
     ReconciliationStatus,
-    Resources,
-    ResourcesSpec,
     ResourceStatus,
 )
 from reconcile.utils.aws_api_typed.api import AWSApi
@@ -75,48 +73,10 @@ class DynamoDBStateAdapter:
     MODCONF_VERSION = "version"
     MODCONF_DRIFT_MINS = "drift_detection_minutes"
     MODCONF_TIMEOUT_MINS = "timeout_minutes"
-    MODCONF_RESOURCES = "resources"
-    MODCONF_RESOURCES_REQUESTS = "requests"
-    MODCONF_RESOURCES_REQUESTS_CPU = "cpu"
-    MODCONF_RESOURCES_REQUESTS_MEMORY = "memory"
-    MODCONF_RESOURCES_LIMITS = "limits"
-    MODCONF_RESOURCES_LIMITS_CPU = "cpu"
-    MODCONF_RESOURCES_LIMITS_MEMORY = "memory"
 
     def _get_value(self, item: Mapping[str, Any], key: str, type: str = "S") -> Any:
-        if item[key][type] == "None":
-            return None
         return item[key][type]
 
-    def _build_resources(self, modconf: Mapping[str, Any]) -> Resources | None:
-        if self.MODCONF_RESOURCES not in modconf:
-            return Resources()
-        mc_resources = self._get_value(modconf, self.MODCONF_RESOURCES, type="M")
-        mc_resources_requests = self._get_value(
-            mc_resources, self.MODCONF_RESOURCES_REQUESTS, type="M"
-        )
-        mc_resources_limits = self._get_value(
-            mc_resources, self.MODCONF_RESOURCES_LIMITS, type="M"
-        )
-        return Resources(
-            requests=ResourcesSpec(
-                cpu=self._get_value(
-                    mc_resources_requests, self.MODCONF_RESOURCES_REQUESTS_CPU
-                ),
-                memory=self._get_value(
-                    mc_resources_requests, self.MODCONF_RESOURCES_REQUESTS_MEMORY
-                ),
-            ),
-            limits=ResourcesSpec(
-                cpu=self._get_value(
-                    mc_resources_limits, self.MODCONF_RESOURCES_LIMITS_CPU
-                ),
-                memory=self._get_value(
-                    mc_resources_limits, self.MODCONF_RESOURCES_LIMITS_MEMORY
-                ),
-            ),
-        )
-
     def deserialize(
         self,
         item: Mapping[str, Any],
@@ -156,7 +116,6 @@ class DynamoDBStateAdapter:
                     reconcile_timeout_minutes=self._get_value(
                         modconf, self.MODCONF_TIMEOUT_MINS, type="N"
                     ),
-                    resources=self._build_resources(modconf),
                 ),
             )
 
@@ -205,39 +164,7 @@ class DynamoDBStateAdapter:
                                     state.reconciliation.module_configuration.reconcile_timeout_minutes
                                 )
                             },
-                            self.MODCONF_RESOURCES: {
-                                "M": {
-                                    self.MODCONF_RESOURCES_REQUESTS: {
-                                        "M": {
-                                            self.MODCONF_RESOURCES_REQUESTS_CPU: {
-                                                "S": str(
-                                                    state.reconciliation.module_configuration.resources.requests.cpu
-                                                )
-                                            },
-                                            self.MODCONF_RESOURCES_REQUESTS_MEMORY: {
-                                                "S": str(
-                                                    state.reconciliation.module_configuration.resources.requests.memory
-                                                )
-                                            },
-                                        }
-                                    },
-                                    self.MODCONF_RESOURCES_LIMITS: {
-                                        "M": {
-                                            self.MODCONF_RESOURCES_LIMITS_CPU: {
-                                                "S": str(
-                                                    state.reconciliation.module_configuration.resources.limits.cpu
-                                                )
-                                            },
-                                            self.MODCONF_RESOURCES_LIMITS_MEMORY: {
-                                                "S": str(
-                                                    state.reconciliation.module_configuration.resources.limits.memory
-                                                )
-                                            },
-                                        }
-                                    },
-                                }
-                            },
-                        },
+                        }
                     },
                 }
             },

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/gql_definitions/external_resources/external_resources_modules.py

@@ -17,21 +17,8 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
-
 
 DEFINITION = """
-fragment DeployResourcesFields on DeployResources_v1 {
-  requests {
-    cpu
-    memory
-  }
-  limits {
-    cpu
-    memory
-  }
-}
-
 query ExternalResourcesModules {
     modules: external_resources_modules_v1 {
         provision_provider
@@ -44,9 +31,6 @@ query ExternalResourcesModules {
         outputs_secret_sync
         outputs_secret_image
         outputs_secret_version
-        resources {
-          ... DeployResourcesFields
-        }
     }
 }
 """
@@ -69,7 +53,6 @@ class ExternalResourcesModuleV1(ConfiguredBaseModel):
     outputs_secret_sync: bool = Field(..., alias="outputs_secret_sync")
     outputs_secret_image: Optional[str] = Field(..., alias="outputs_secret_image")
     outputs_secret_version: Optional[str] = Field(..., alias="outputs_secret_version")
-    resources: Optional[DeployResourcesFields] = Field(..., alias="resources")
 
 
 class ExternalResourcesModulesQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -19,7 +19,6 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 
 from reconcile.gql_definitions.fragments.aws_vpc import AWSVPC
 from reconcile.gql_definitions.fragments.jumphost_common_fields import CommonJumphostFields
-from reconcile.gql_definitions.external_resources.fragments.external_resources_module_overrides import ExternalResourcesModuleOverrides
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 
@@ -54,29 +53,6 @@ fragment CommonJumphostFields on ClusterJumpHost_v1 {
   }
 }
 
-fragment DeployResourcesFields on DeployResources_v1 {
-  requests {
-    cpu
-    memory
-  }
-  limits {
-    cpu
-    memory
-  }
-}
-
-fragment ExternalResourcesModuleOverrides on ExternalResourcesModuleOverrides_v1 {
-  module_type
-  image
-  version
-  reconcile_timeout_minutes
-  outputs_secret_image
-  outputs_secret_version
-  resources {
-    ... DeployResourcesFields
-  }
-}
-
 fragment VaultSecret on VaultSecret_v1 {
     path
     field
@@ -135,7 +111,12 @@ query ExternalResourcesNamespaces {
                 managed_by_erv2
                 delete
                 module_overrides {
-                   ... ExternalResourcesModuleOverrides
+                    module_type
+                    image
+                    version
+                    reconcile_timeout_minutes
+                    outputs_secret_image
+                    outputs_secret_version
                 }
             }
             ... on NamespaceTerraformResourceS3_v1 {
@@ -168,7 +149,12 @@ query ExternalResourcesNamespaces {
                 managed_by_erv2
                 delete
                 module_overrides {
-                   ... ExternalResourcesModuleOverrides
+                  module_type
+                  image
+                  version
+                  reconcile_timeout_minutes
+                  outputs_secret_image
+                  outputs_secret_version
                 }
             }
             ... on NamespaceTerraformResourceServiceAccount_v1 {
@@ -289,7 +275,12 @@ query ExternalResourcesNamespaces {
                 managed_by_erv2
                 delete
                 module_overrides {
-                   ... ExternalResourcesModuleOverrides
+                  module_type
+                  image
+                  version
+                  reconcile_timeout_minutes
+                  outputs_secret_image
+                  outputs_secret_version
                 }
             }
             ... on NamespaceTerraformResourceElasticSearch_v1 {
@@ -501,7 +492,12 @@ query ExternalResourcesNamespaces {
                 managed_by_erv2
                 delete
                 module_overrides {
-                   ... ExternalResourcesModuleOverrides
+                  module_type
+                  image
+                  version
+                  reconcile_timeout_minutes
+                  outputs_secret_image
+                  outputs_secret_version
                 }
             }
         }
@@ -580,6 +576,15 @@ class AWSRDSDataClassificationV1(ConfiguredBaseModel):
     loss_impact: Optional[str] = Field(..., alias="loss_impact")
 
 
+class ExternalResourcesModuleOverridesV1(ConfiguredBaseModel):
+    module_type: Optional[str] = Field(..., alias="module_type")
+    image: Optional[str] = Field(..., alias="image")
+    version: Optional[str] = Field(..., alias="version")
+    reconcile_timeout_minutes: Optional[int] = Field(..., alias="reconcile_timeout_minutes")
+    outputs_secret_image: Optional[str] = Field(..., alias="outputs_secret_image")
+    outputs_secret_version: Optional[str] = Field(..., alias="outputs_secret_version")
+
+
 class NamespaceTerraformResourceRDSV1(NamespaceTerraformResourceAWSV1):
     region: Optional[str] = Field(..., alias="region")
     identifier: str = Field(..., alias="identifier")
@@ -599,7 +604,7 @@ class NamespaceTerraformResourceRDSV1(NamespaceTerraformResourceAWSV1):
     data_classification: Optional[AWSRDSDataClassificationV1] = Field(..., alias="data_classification")
     managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
     delete: Optional[bool] = Field(..., alias="delete")
-    module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
+    module_overrides: Optional[ExternalResourcesModuleOverridesV1] = Field(..., alias="module_overrides")
 
 
 class AWSS3EventNotificationV1(ConfiguredBaseModel):
@@ -624,6 +629,15 @@ class NamespaceTerraformResourceS3V1(NamespaceTerraformResourceAWSV1):
     annotations: Optional[str] = Field(..., alias="annotations")
 
 
+class NamespaceTerraformResourceElastiCacheV1_ExternalResourcesModuleOverridesV1(ConfiguredBaseModel):
+    module_type: Optional[str] = Field(..., alias="module_type")
+    image: Optional[str] = Field(..., alias="image")
+    version: Optional[str] = Field(..., alias="version")
+    reconcile_timeout_minutes: Optional[int] = Field(..., alias="reconcile_timeout_minutes")
+    outputs_secret_image: Optional[str] = Field(..., alias="outputs_secret_image")
+    outputs_secret_version: Optional[str] = Field(..., alias="outputs_secret_version")
+
+
 class NamespaceTerraformResourceElastiCacheV1(NamespaceTerraformResourceAWSV1):
     identifier: str = Field(..., alias="identifier")
     defaults: str = Field(..., alias="defaults")
@@ -634,7 +648,7 @@ class NamespaceTerraformResourceElastiCacheV1(NamespaceTerraformResourceAWSV1):
     annotations: Optional[str] = Field(..., alias="annotations")
     managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
     delete: Optional[bool] = Field(..., alias="delete")
-    module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
+    module_overrides: Optional[NamespaceTerraformResourceElastiCacheV1_ExternalResourcesModuleOverridesV1] = Field(..., alias="module_overrides")
 
 
 class ClusterV1(ConfiguredBaseModel):
@@ -770,6 +784,15 @@ class NamespaceTerraformResourceCloudWatchV1(NamespaceTerraformResourceAWSV1):
     annotations: Optional[str] = Field(..., alias="annotations")
 
 
+class NamespaceTerraformResourceKMSV1_ExternalResourcesModuleOverridesV1(ConfiguredBaseModel):
+    module_type: Optional[str] = Field(..., alias="module_type")
+    image: Optional[str] = Field(..., alias="image")
+    version: Optional[str] = Field(..., alias="version")
+    reconcile_timeout_minutes: Optional[int] = Field(..., alias="reconcile_timeout_minutes")
+    outputs_secret_image: Optional[str] = Field(..., alias="outputs_secret_image")
+    outputs_secret_version: Optional[str] = Field(..., alias="outputs_secret_version")
+
+
 class NamespaceTerraformResourceKMSV1(NamespaceTerraformResourceAWSV1):
     region: Optional[str] = Field(..., alias="region")
     identifier: str = Field(..., alias="identifier")
@@ -779,7 +802,7 @@ class NamespaceTerraformResourceKMSV1(NamespaceTerraformResourceAWSV1):
     annotations: Optional[str] = Field(..., alias="annotations")
     managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
     delete: Optional[bool] = Field(..., alias="delete")
-    module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
+    module_overrides: Optional[NamespaceTerraformResourceKMSV1_ExternalResourcesModuleOverridesV1] = Field(..., alias="module_overrides")
 
 
 class NamespaceTerraformResourceElasticSearchV1(NamespaceTerraformResourceAWSV1):
@@ -1021,6 +1044,15 @@ class MskSecretParametersV1(ConfiguredBaseModel):
     secret: VaultSecret = Field(..., alias="secret")
 
 
+class NamespaceTerraformResourceMskV1_ExternalResourcesModuleOverridesV1(ConfiguredBaseModel):
+    module_type: Optional[str] = Field(..., alias="module_type")
+    image: Optional[str] = Field(..., alias="image")
+    version: Optional[str] = Field(..., alias="version")
+    reconcile_timeout_minutes: Optional[int] = Field(..., alias="reconcile_timeout_minutes")
+    outputs_secret_image: Optional[str] = Field(..., alias="outputs_secret_image")
+    outputs_secret_version: Optional[str] = Field(..., alias="outputs_secret_version")
+
+
 class NamespaceTerraformResourceMskV1(NamespaceTerraformResourceAWSV1):
     region: Optional[str] = Field(..., alias="region")
     identifier: str = Field(..., alias="identifier")
@@ -1030,7 +1062,7 @@ class NamespaceTerraformResourceMskV1(NamespaceTerraformResourceAWSV1):
     users: Optional[list[MskSecretParametersV1]] = Field(..., alias="users")
     managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
     delete: Optional[bool] = Field(..., alias="delete")
-    module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
+    module_overrides: Optional[NamespaceTerraformResourceMskV1_ExternalResourcesModuleOverridesV1] = Field(..., alias="module_overrides")
 
 
 class NamespaceTerraformProviderResourceAWSV1(NamespaceExternalResourceV1):

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/gql_definitions/external_resources/external_resources_settings.py

@@ -17,21 +17,8 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
-
 
 DEFINITION = """
-fragment DeployResourcesFields on DeployResources_v1 {
-  requests {
-    cpu
-    memory
-  }
-  limits {
-    cpu
-    memory
-  }
-}
-
 query ExternalResourcesSettings {
     settings: external_resources_settings_v1 {
         state_dynamodb_account {
@@ -51,9 +38,6 @@ query ExternalResourcesSettings {
         vault_secrets_path
         outputs_secret_image
         outputs_secret_version
-        module_default_resources {
-          ... DeployResourcesFields
-        }
     }
 }
 """
@@ -89,7 +73,6 @@ class ExternalResourcesSettingsV1(ConfiguredBaseModel):
     vault_secrets_path: str = Field(..., alias="vault_secrets_path")
     outputs_secret_image: str = Field(..., alias="outputs_secret_image")
     outputs_secret_version: str = Field(..., alias="outputs_secret_version")
-    module_default_resources: DeployResourcesFields = Field(..., alias="module_default_resources")
 
 
 class ExternalResourcesSettingsQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev40 → qontract_reconcile-0.10.2.dev42}/reconcile/gql_definitions/introspection.json

@@ -33803,22 +33803,6 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
-                        },
-                        {
-                            "name": "module_default_resources",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "OBJECT",
-                                    "name": "DeployResources_v1",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -34020,18 +34004,6 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
-                        },
-                        {
-                            "name": "resources",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "OBJECT",
-                                "name": "DeployResources_v1",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -42955,18 +42927,6 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
-                        },
-                        {
-                            "name": "resources",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "OBJECT",
-                                "name": "DeployResources_v1",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,