qontract-reconcile 0.10.2.dev278__py3-none-any.whl → 0.10.2.dev280__py3-none-any.whl

{qontract_reconcile-0.10.2.dev278.dist-info → qontract_reconcile-0.10.2.dev280.dist-info}/METADATA

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

@@ -93,7 +93,7 @@ reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
 reconcile/resource_template_tester.py,sha256=DsKvBuNLPxm4Fa-e1YHHySnhThm5i_j-nF3G4b02Mz0,2416
-reconcile/run_integration.py,sha256=brbNFEQpHLeLIEN-sDpIctyrx8aiL5Vu9YLecdwwykk,10221
+reconcile/run_integration.py,sha256=M2rIpcx7k0vGkTHdgm0h1efLOWiJ-O2WbYPHKtvIpWA,10214
 reconcile/saas_file_validator.py,sha256=tyvFYU6lnkfDYIkAIr5pWqSvO5Yc6TagZ-quJYD2dtI,2547
 reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9D8,4773
 reconcile/service_dependencies.py,sha256=KydjllianL0lUwhroBAPui7jrnhHSq7j2PB6CoV2nuU,4349
@@ -117,7 +117,7 @@ reconcile/vpc_peerings_validator.py,sha256=aESqrhm1tpkc2iqSL1UV5to_HjNgjRSffD0cr
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=Cx-WthkvlcX58PrnnNeo_bQG17Xw3BGNu3f53Jc1VoA,23985
 reconcile/aus/aus_label_source.py,sha256=o0S2f0qwcII_8nzhHZhRQ83gEZ1DrSXyO4xzSwLebuU,4382
-reconcile/aus/base.py,sha256=RAtYkwCM2CIqv37XkgyzFyTiNNnImCD-yMQ698QYgAY,51451
+reconcile/aus/base.py,sha256=Gd76QvSO2PjINjsth7sEeJPrD1a0TLYtpgNzTWIzj2w,50016
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
 reconcile/aus/metrics.py,sha256=BhIvZVTn25fIzijz3xFynJngS2sXDBTxxprUUVWJcFo,4246
@@ -184,17 +184,17 @@ reconcile/endpoints_discovery/integration.py,sha256=P63yx5OPlLEFKMDTk5vR9AX3ve8P
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
 reconcile/endpoints_discovery/merge_request_manager.py,sha256=a8zTIQIpRrUwXexZClwpQnnkEoS6XNZLJziI9x7ly0s,6389
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/external_resources/aws.py,sha256=0Vjobt0zHcGkPV9C_lXHGV2uSbvU8XX00tLCmEmlKvs,11984
+reconcile/external_resources/aws.py,sha256=kh5p9KsYB7naewVPLPtcCjnIrUECmdR6lUgDrzIlL1k,11985
 reconcile/external_resources/factories.py,sha256=C0QHT0soEv6z99-ELAAE19S5MaMHhV0t1fSiQn0Coc4,5970
 reconcile/external_resources/integration.py,sha256=WF6O4rT0oUHbNaWEemjLLzCqdNSQIUaymUuj08VsIl8,7034
 reconcile/external_resources/integration_secrets_sync.py,sha256=M2uOFi2JXWhiw3hQyE_4NVPQmPIYGHlghRti5eLWhkw,1738
 reconcile/external_resources/manager.py,sha256=Wb1Qk4aVwag5Godo2OGzRsgHZJ9d3nkwqOzCmqptrXs,18257
 reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
 reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMcVdISlxhzXE,3898
-reconcile/external_resources/model.py,sha256=GJG1-KKAueBvNGRXa6O4YcT1M8xOSHx2OXb3aAoZF2w,14944
+reconcile/external_resources/model.py,sha256=o_39sJPIo0-d-oYHAB97lg6cBnxJX6NA0DvF1Egy0_o,14889
 reconcile/external_resources/reconciler.py,sha256=wB8cB5pmqDJ1_t5_Aly4mrULGnI3OQaKqUZCB_Z9RWw,9573
 reconcile/external_resources/secrets_sync.py,sha256=lLhsB5mVJTnumkGVT0tnkCW9VHcUHBG35gziOS2ojSg,16218
-reconcile/external_resources/state.py,sha256=Hyc3hszY1NFWg3t9QSXL2F5bRs0vP2FNDWzTGrHJsmE,13387
+reconcile/external_resources/state.py,sha256=xRciI7xgMxhn1f5VzL4h5usXsGkibYQxrMT1h7n03gE,13367
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/fleet_labeler/dependencies.py,sha256=MFiSfT25Ks0X3iQxwayNvFX_l6bQi97f3IiaNR1wtHc,3173
 reconcile/fleet_labeler/integration.py,sha256=HGlUJe5BCfAgk7YCxxsIteB8LH1pL8led-KfaIVh214,14614
@@ -658,7 +658,7 @@ reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41F
 reconcile/utils/state.py,sha256=h5iAfNf1p_wf79Z09XNZ5C_YVrIqUmhhl_DWqnFrwT0,16364
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/terraform_client.py,sha256=0NCYluGnFooxbgxSHyxoU_Hj3WUVZ-HqpLZI6ZmzJ1E,37301
-reconcile/utils/terrascript_aws_client.py,sha256=o5i2j3kf00cC4Gk-UQ0fRgj7fYSwmzvuk70TiQ5Rm3g,292325
+reconcile/utils/terrascript_aws_client.py,sha256=69n4alIE6jFd_J5t_NNzq54I8FCkFVkKT3xTohbWiN0,292495
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=6V15LByFghp-U3k0N4lum6V7qt2EAlRfcAxjy5e-FAU,15146
@@ -697,7 +697,7 @@ reconcile/utils/jinja2/filters.py,sha256=JfO_14APySBPidsMvHXG-8dULNPddZCE15Umjk_
 reconcile/utils/jinja2/utils.py,sha256=z20GzZsksQzbcahCwfbffHj6PU-JTifH0JzMZdPP7hU,9138
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jobcontroller/controller.py,sha256=Vh08lZuCSIIceWGSDhBB00iFwTI9eeKZW1sfHlkAvSo,15373
-reconcile/utils/jobcontroller/models.py,sha256=x9YIvWfYOOvXNKToFVx1H7qDrZb0Sa1KI_4Y0gl7rMM,6336
+reconcile/utils/jobcontroller/models.py,sha256=nfJ-w7DtDC5IZ5YD3YX8ytl61rnZUaa-Sbq3IjWEJwI,6296
 reconcile/utils/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/membershipsources/app_interface_resolver.py,sha256=MqDFvK3aXhmmMuMiIygC-onFVrrIopKHriaYJQ5jnuY,1988
 reconcile/utils/membershipsources/models.py,sha256=yuEbG4HJ3NOEpSS9EH7OAx1U-uiRW-QmNMAZJe1Rb-U,1898
@@ -737,7 +737,7 @@ reconcile/utils/ocm/sre_capability_labels.py,sha256=nqh0imrYczNeeeC7ZNX3pEwuAIVk
 reconcile/utils/ocm/status_board.py,sha256=8DYeIrOsW8Bh5PCtKdvGGpaxb9Wugcc5rLxZJ8Z7b_s,4181
 reconcile/utils/ocm/subscriptions.py,sha256=hehKXsDXIhnhqvWOuiYvx6y2FGq3zt0APGYj7WiBIdI,2765
 reconcile/utils/ocm/syncsets.py,sha256=9IQm1l5BodOVZa2OFbQmow3afmh4nXe5pn-CCJ5LxTI,1169
-reconcile/utils/ocm/upgrades.py,sha256=UEgfSJuC8nH6jW9JjEx91_9QeeHR1UJ_9FVOX_PlvTU,4712
+reconcile/utils/ocm/upgrades.py,sha256=W8-sLgETI_418ftY9vBlXswyjx_KdhJTJO9cwBL3hfY,4162
 reconcile/utils/rosa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/rosa/rosa_cli.py,sha256=zV8kKG5s3oFJwyW3E7xxNzqSE7JydrmBx169Jxm8sew,11331
 reconcile/utils/rosa/session.py,sha256=CwlQJ7eEfaMjVOt_6KoNJZc4oQj-iC-EOZq8eSGzjuI,6861
@@ -771,7 +771,7 @@ tools/app_sre_tekton_access_reporter.py,sha256=5qmkevJdlb2j_lpGC5Pu1Pmo0eomX5Zxz
 tools/app_sre_tekton_access_revalidation.py,sha256=vwL1o_j7oSTOhrHNH1znpgjA2LHGzb8yc5iG3aaY4m0,2684
 tools/glitchtip_access_reporter.py,sha256=wnaiDGW4MkYONV_erltnJ6nGkEj0kQrAiv04NNnOS0k,2859
 tools/glitchtip_access_revalidation.py,sha256=jjeLO53LTbz_LfQw3G2Cs8lVLO_6xqU39BYyTH3cEPE,2764
-tools/qontract_cli.py,sha256=mNo-m6Xd74E_t1znXsW9IlnOd2LE9cEchO5LZpQBTXc,159162
+tools/qontract_cli.py,sha256=JrITQaYuYtJVmfdvwrGtlPHDExSVYYwDOjNBADN6YWc,159332
 tools/template_validation.py,sha256=Xn9X4sGFznx-rvBDnq9Kq16rfET8V3bqH1EwavsGBac,3335
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=8mAjCS6XR0yD7k0mfiVBlt6xbYU47q_ftdYNi5o5VKE,5566
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=oF7C4hpIgyMTwTRm3Aun3cDCHIjVar65JoLp6NcJHlU,3909
 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.dev278.dist-info/METADATA,sha256=L0l-pOkoslND8UA8-rIGFKDtKTMVu3tRjgBQoFf_b48,24501
-qontract_reconcile-0.10.2.dev278.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev278.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev278.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev280.dist-info/METADATA,sha256=zKtUMc1Xlh56uTOI7X5kaR83dM12KIhMPQYT7VT7ak4,24501
+qontract_reconcile-0.10.2.dev280.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev280.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev280.dist-info/RECORD,,

reconcile/aus/base.py

@@ -83,8 +83,6 @@ from reconcile.utils.ocm.upgrades import (
     create_control_plane_upgrade_policy,
     create_node_pool_upgrade_policy,
     create_upgrade_policy,
-    delete_control_plane_upgrade_policy,
-    delete_upgrade_policy,
     get_control_plane_upgrade_policies,
     get_node_pool_upgrade_policies,
     get_upgrade_policies,
@@ -467,7 +465,7 @@ class AddonUpgradePolicy(AbstractUpgradePolicy):
 
 
 class ClusterUpgradePolicy(AbstractUpgradePolicy):
-    """Class to create and delete ClusterUpgradePolicies in OCM"""
+    """Class to create ClusterUpgradePolicies in OCM"""
 
     def create(self, ocm_api: OCMBaseClient) -> None:
         policy = {
@@ -478,11 +476,7 @@ class ClusterUpgradePolicy(AbstractUpgradePolicy):
         create_upgrade_policy(ocm_api, self.cluster.id, policy)
 
     def delete(self, ocm_api: OCMBaseClient) -> None:
-        if not self.id:
-            raise ValueError(
-                "Cannot delete cluster upgrade policy without id (not created yet)"
-            )
-        delete_upgrade_policy(ocm_api, self.cluster.id, self.id)
+        raise NotImplementedError("ClusterUpgradePolicy.delete() not implemented")
 
     def summarize(self) -> str:
         details = {
@@ -509,11 +503,7 @@ class ControlPlaneUpgradePolicy(AbstractUpgradePolicy):
         create_control_plane_upgrade_policy(ocm_api, self.cluster.id, policy)
 
     def delete(self, ocm_api: OCMBaseClient) -> None:
-        if not self.id:
-            raise ValueError(
-                "Cannot delete controlplane upgrade policy without id (not created yet)"
-            )
-        delete_control_plane_upgrade_policy(ocm_api, self.cluster.id, self.id)
+        raise NotImplementedError("ControlPlaneUpgradePolicy.delete() not implemented")
 
     def summarize(self) -> str:
         details = {
@@ -527,7 +517,7 @@ class ControlPlaneUpgradePolicy(AbstractUpgradePolicy):
 
 class NodePoolUpgradePolicy(AbstractUpgradePolicy):
     node_pool: str
-    """Class to create and delete NodePoolUpgradePolicies in OCM"""
+    """Class to create NodePoolUpgradePolicies in OCM"""
 
     def create(self, ocm_api: OCMBaseClient) -> None:
         policy = {
@@ -910,38 +900,21 @@ def upgradeable_version(
 def verify_current_should_skip(
     current_state: Sequence[AbstractUpgradePolicy],
     desired: ClusterUpgradeSpec,
-    now: datetime,
-    addon_id: str = "",
-) -> tuple[bool, UpgradePolicyHandler | None]:
+) -> bool:
     current_policies = [c for c in current_state if c.cluster.id == desired.cluster.id]
     if not current_policies:
-        return False, None
+        return False
 
     # there can only be one upgrade policy per cluster
     if len(current_policies) != 1:
         raise ValueError(
             f"[{desired.org.org_id}/{desired.cluster.name}] expected only one upgrade policy"
         )
-    current = current_policies[0]
-    version = current.version  # may not exist in automatic upgrades
-    if version and not addon_id and desired.version_blocked(version):
-        next_run = current.next_run
-        if next_run and datetime.strptime(next_run, "%Y-%m-%dT%H:%M:%SZ") < now:
-            logging.warning(
-                f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] currently upgrading to blocked version '{version}'"
-            )
-            return True, None
-        logging.debug(
-            f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] found planned upgrade policy "
-            + f"with blocked version {version}"
-        )
-        return False, UpgradePolicyHandler(action="delete", policy=current)
 
-    # else
     logging.debug(
         f"[{desired.org.org_id}/{desired.org.name}/{desired.cluster.name}] skipping cluster with existing upgrade policy"
     )
-    return True, None
+    return True
 
 
 def verify_schedule_should_skip(
@@ -1129,14 +1102,8 @@ def calculate_diff(
                 set_upgrading(spec.cluster.id, spec.effective_mutexes, sector_name)
                 continue
 
-        # ignore clusters with an existing upgrade policy
-        skip, delete_policy = verify_current_should_skip(
-            current_state, spec, now, addon_id
-        )
-        if skip:
+        if verify_current_should_skip(current_state, spec):
             continue
-        if delete_policy:
-            diffs.append(delete_policy)
 
         next_schedule = verify_schedule_should_skip(spec, now, addon_id)
         if not next_schedule:

reconcile/external_resources/aws.py

@@ -189,7 +189,7 @@ class AWSRdsFactory(AWSDefaultResourceFactory):
         if "availability_zone" in data and "region" not in data:
             data["region"] = self._get_region_from_az(data["availability_zone"])
 
-        kms_key_id: str = data.get("kms_key_id", None)
+        kms_key_id: str | None = data.get("kms_key_id")
         if kms_key_id and not kms_key_id.startswith("arn:"):
             data["kms_key_id"] = self._get_kms_key_spec(
                 spec.provisioner_name, kms_key_id

reconcile/external_resources/model.py

@@ -186,8 +186,8 @@ class ExternalResourcesInventory(MutableMapping):
 
 
 class Action(StrEnum):
-    DESTROY: str = "Destroy"
-    APPLY: str = "Apply"
+    DESTROY = "Destroy"
+    APPLY = "Apply"
 
 
 class ExternalResourceModuleKey(BaseModel, frozen=True):
@@ -348,15 +348,15 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
 
 
 class ResourceStatus(StrEnum):
-    CREATED: str = "CREATED"
-    DELETED: str = "DELETED"
-    ABANDONED: str = "ABANDONED"
-    NOT_EXISTS: str = "NOT_EXISTS"
-    IN_PROGRESS: str = "IN_PROGRESS"
-    DELETE_IN_PROGRESS: str = "DELETE_IN_PROGRESS"
-    ERROR: str = "ERROR"
-    PENDING_SECRET_SYNC: str = "PENDING_SECRET_SYNC"
-    RECONCILIATION_REQUESTED: str = "RECONCILIATION_REQUESTED"
+    CREATED = "CREATED"
+    DELETED = "DELETED"
+    ABANDONED = "ABANDONED"
+    NOT_EXISTS = "NOT_EXISTS"
+    IN_PROGRESS = "IN_PROGRESS"
+    DELETE_IN_PROGRESS = "DELETE_IN_PROGRESS"
+    ERROR = "ERROR"
+    PENDING_SECRET_SYNC = "PENDING_SECRET_SYNC"
+    RECONCILIATION_REQUESTED = "RECONCILIATION_REQUESTED"
 
     @property
     def does_not_exist(self) -> bool:

reconcile/external_resources/state.py

@@ -25,10 +25,10 @@ class StateNotFoundError(Exception):
 
 
 class ReconcileStatus(StrEnum):
-    SUCCESS: str = "SUCCESS"
-    ERROR: str = "ERROR"
-    IN_PROGRESS: str = "IN_PROGRESS"
-    NOT_EXISTS: str = "NOT_EXISTS"
+    SUCCESS = "SUCCESS"
+    ERROR = "ERROR"
+    IN_PROGRESS = "IN_PROGRESS"
+    NOT_EXISTS = "NOT_EXISTS"
 
 
 class ExternalResourceState(BaseModel):

reconcile/run_integration.py

@@ -120,7 +120,7 @@ def build_entry_point_args(
     # we add it right before the extra_args
     if (
         integration_name
-        and isinstance(command, click.MultiCommand)
+        and isinstance(command, click.Group)
         and command.get_command(None, integration_name)  # type: ignore
     ):
         args.append(integration_name)

reconcile/utils/jobcontroller/models.py

@@ -20,17 +20,17 @@ from kubernetes.client import (
 
 
 class JobStatus(StrEnum):
-    SUCCESS: str = "SUCCESS"
-    ERROR: str = "ERROR"
-    IN_PROGRESS: str = "IN_PROGRESS"
-    NOT_EXISTS: str = "NOT_EXISTS"
+    SUCCESS = "SUCCESS"
+    ERROR = "ERROR"
+    IN_PROGRESS = "IN_PROGRESS"
+    NOT_EXISTS = "NOT_EXISTS"
 
 
 class JobConcurrencyPolicy(IntFlag):
-    NO_REPLACE: int = 1
-    REPLACE_FAILED: int = 2
-    REPLACE_IN_PROGRESS: int = 4
-    REPLACE_FINISHED: int = 8
+    NO_REPLACE = 1
+    REPLACE_FAILED = 2
+    REPLACE_IN_PROGRESS = 4
+    REPLACE_FINISHED = 8
 
 
 class JobValidationError(Exception):

reconcile/utils/ocm/upgrades.py

@@ -77,15 +77,6 @@ def create_upgrade_policy(ocm_api: OCMBaseClient, cluster_id: str, spec: dict) -
     ocm_api.post(f"{build_cluster_url(cluster_id)}/upgrade_policies", spec)
 
 
-def delete_upgrade_policy(
-    ocm_api: OCMBaseClient, cluster_id: str, policy_id: str
-) -> None:
-    """
-    Deletes an existing Upgrade Policy
-    """
-    ocm_api.delete(f"{build_cluster_url(cluster_id)}/upgrade_policies/{policy_id}")
-
-
 #
 # CONTROL PLANE UPGRADE POLICIES
 #
@@ -120,17 +111,6 @@ def create_control_plane_upgrade_policy(
     )
 
 
-def delete_control_plane_upgrade_policy(
-    ocm_api: OCMBaseClient, cluster_id: str, upgrade_policy_id: str
-) -> None:
-    """
-    Deletes an existing Control Plane Upgrade Policy
-    """
-    ocm_api.delete(
-        f"{build_cluster_url(cluster_id)}/control_plane/upgrade_policies/{upgrade_policy_id}"
-    )
-
-
 #
 # NODE POOLUPGRADE POLICIES
 #

reconcile/utils/terrascript_aws_client.py

@@ -993,9 +993,11 @@ class TerrascriptClient:
                 lifecycle.prevent_destroy = False
             if lifecycle.ignore_changes is None:
                 lifecycle.ignore_changes = []
-            if "all" in lifecycle.ignore_changes:
-                lifecycle.ignore_changes = "all"
-            return lifecycle.dict(by_alias=True)
+            # 'all' must be passed as a string for ignore_changes! stupid terraform aws provider!
+            ignore_changes = (
+                "all" if "all" in lifecycle.ignore_changes else lifecycle.ignore_changes
+            )
+            return lifecycle.dict(by_alias=True) | {"ignore_changes": ignore_changes}
         return None
 
     def populate_additional_providers(self, infra_account_name: str, accounts):

tools/qontract_cli.py

@@ -1031,6 +1031,9 @@ def clusters_network(ctx: click.Context, name: str) -> None:
                 ocm_map.get(cluster_name),
                 provided_assume_role=None,
             )
+            assert account is not None, (
+                f"Failed to build assume role for cluster {cluster_name} in account {management_account['name']}"
+            )
             account["resourcesDefaultRegion"] = management_account[
                 "resourcesDefaultRegion"
             ]