qontract-reconcile 0.10.2.dev79__py3-none-any.whl → 0.10.2.dev81__py3-none-any.whl

{qontract_reconcile-0.10.2.dev79.dist-info → qontract_reconcile-0.10.2.dev81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev79
+Version: 0.10.2.dev81
 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.dev79.dist-info → qontract_reconcile-0.10.2.dev81.dist-info}/RECORD

@@ -208,8 +208,8 @@ reconcile/external_resources/secrets_sync.py,sha256=50fK4fzgSz-K8uy5_DQQWA_ju_rT
 reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/fleet_labeler/dependencies.py,sha256=Ta-SLnrHRN4OBAmhE_mTk1P7y1X7AInIiQsIYaY6hY0,2910
-reconcile/fleet_labeler/integration.py,sha256=jlgHR9U95x4paAckyqlD0FlFn1b-RhBJNYT4htKkrlk,7262
-reconcile/fleet_labeler/merge_request.py,sha256=Mg_ueGj3ZMYIOT6yz2nb8jlpoR1V7fSkCIbljCtnmCc,1137
+reconcile/fleet_labeler/integration.py,sha256=gDK97QvsJ5IEo1t1ci4yxTRM7VSDj4uP9l30zHi_rWo,7700
+reconcile/fleet_labeler/merge_request.py,sha256=VA_XSIob4LWYb02dRUr9coXjIa8_0prObI1v5Gqi_mY,1513
 reconcile/fleet_labeler/meta.py,sha256=DF7O4T9wvQ7-xTWXvuNw1OG_F0SBmRrjFBtVy9wWh9U,146
 reconcile/fleet_labeler/metrics.py,sha256=wx9BmXLsN67m-aSsf81iB7Ehj5SzUsS2WB75isUReZg,662
 reconcile/fleet_labeler/ocm.py,sha256=GGsz-bq1g8BJVVMCfI2kSwZCyngbQoZ3i3k8fO608KA,2506
@@ -646,7 +646,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=H8frsS370y8xfivKLNBD1dwlBLHvfuR6JSN_syBL5Qc,36033
-reconcile/utils/terrascript_aws_client.py,sha256=n22HESuN24UVT9g0cEqLWqy1n6_RnCTGSQqt-Sg39Qw,286203
+reconcile/utils/terrascript_aws_client.py,sha256=-l2a8Sa5FIzFwVDgHEHcqQeqBGTMn7nacb1p5B8junI,286242
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -786,7 +786,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev79.dist-info/METADATA,sha256=60Q1QohZz4pk4aCZ-CPMJbA4Q0YnfgOnLVWp7hlfKZc,24565
-qontract_reconcile-0.10.2.dev79.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev79.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev79.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev81.dist-info/METADATA,sha256=UGta8zuDkNLq5r2AZb6rYi8wn7ERsZ-jTHUwAadgF94,24565
+qontract_reconcile-0.10.2.dev81.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev81.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev81.dist-info/RECORD,,

reconcile/fleet_labeler/integration.py

@@ -180,6 +180,15 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
         if not (cluster_ids_to_delete or clusters_to_add):
             return
 
+        for yaml_cluster in clusters_to_add:
+            logging.info(
+                f"[{spec.name}] Adding cluster '{yaml_cluster.name}' with id '{yaml_cluster.cluster_id}' to inventory with default labels {yaml_cluster.subscription_labels_content}."
+            )
+        for cluster_id in cluster_ids_to_delete:
+            logging.info(
+                f"[{spec.name}] Deleting cluster {cluster_id=} from inventory."
+            )
+
         current_content = vcs.get_file_content_from_main(path=spec.path)
         # Lets make sure we are deterministic when adding new clusters
         # The overhead is neglectable and it makes testing easier

reconcile/fleet_labeler/merge_request.py

@@ -17,6 +17,9 @@ class YamlCluster(BaseModel):
 
 
 class FleetLabelerUpdates(MergeRequestBase):
+    # Note, this name is used for the branch name that is being created.
+    name = "fleet_labeler_updates"
+
     def __init__(
         self,
         path: str,
@@ -24,7 +27,6 @@ class FleetLabelerUpdates(MergeRequestBase):
     ):
         self._path = path
         self._content = content
-        self._title = f"[Fleet Labeler] Update cluster inventory for {path}"
 
         super().__init__()
 
@@ -32,11 +34,17 @@ class FleetLabelerUpdates(MergeRequestBase):
 
     @property
     def title(self) -> str:
-        return self._title
+        return f"[Fleet Labeler] Update cluster inventory for {self._path}"
 
     @property
     def description(self) -> str:
-        return self._title
+        return f"""
+This is an automatically generated MR by the [fleet-labeler](https://github.com/app-sre/qontract-reconcile/tree/master/reconcile/fleet_labeler) integration.
+
+This MR updates the cluster inventory for the fleet label spec defined at {self._path}.
+
+Please do not manually change anything in this MR.
+"""
 
     def process(self, gitlab_cli: GitLabApi) -> None:
         msg = "update cluster inventory"

reconcile/utils/terrascript_aws_client.py

@@ -5295,6 +5295,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             lb_access_logs_s3_bucket_values = {
                 "provider": provider,
                 "bucket": bucket_identifier,
+                "force_destroy": True,
             }
             lb_access_logs_s3_bucket_tf_resource = aws_s3_bucket(
                 bucket_identifier, **lb_access_logs_s3_bucket_values