qontract-reconcile 0.10.1rc938__py3-none-any.whl → 0.10.1rc939__py3-none-any.whl

{qontract_reconcile-0.10.1rc938.dist-info → qontract_reconcile-0.10.1rc939.dist-info}/METADATA

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

@@ -57,14 +57,14 @@ reconcile/ocm_aws_infrastructure_access.py,sha256=SghVWdmgliPVo_xHsp-e64_iC3mqDi
 reconcile/ocm_clusters.py,sha256=bD8zlnUbwfDaVvHd-lSDGWmqY1ag_Gcr6kQ0y3aiKG4,16702
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
-reconcile/ocm_groups.py,sha256=CluPyvmwE5JOZS2HQSReC1sD8L1ChhnJlAg8lcwdtxc,3395
+reconcile/ocm_groups.py,sha256=-rTPMewkdyo1De6gs4u-294p3z34oUbGfuNi8ov56Sk,3424
 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=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
+reconcile/openshift_groups.py,sha256=sK2wLWwNupztbfyFPl32VH42s_s8Mu3g-URdlisnwJc,9382
 reconcile/openshift_limitranges.py,sha256=UvCGo_OQ4XoDK55TJmn55qEhhlkhLzhU12tX8nT5kPQ,3442
 reconcile/openshift_namespace_labels.py,sha256=pqKAWjNicCQBoq7CwQI-dpW2dcy9sFZl-rBiO2m-e0k,15605
 reconcile/openshift_namespaces.py,sha256=DdQ4a76g0E7dgRPZEA8MTtZthzUJQjWAb5VdspArWtE,5795
@@ -763,7 +763,7 @@ reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOG
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
-reconcile/utils/ocm/base.py,sha256=IF-TOj9YqDBfuXRMAxCZ8xFTNsgLQdsAxCtIk4UjH4E,14457
+reconcile/utils/ocm/base.py,sha256=iL_uMN03URDisWHpsaGGto_pLx652epUkuld_9ctx5o,14555
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Fn4swizm1qq-XiNlIZ9SvahkftWAyNT8hF4kqRBpK4g,8287
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
@@ -842,8 +842,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.1rc938.dist-info/METADATA,sha256=8eH4i_Fb7X4grau64UTXOtx-nGf9JlgMej8egsZGHAU,2262
-qontract_reconcile-0.10.1rc938.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc938.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc938.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc938.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc939.dist-info/METADATA,sha256=ULnjl5Sj7paYWKaO16SwIorJAhe-FNLim-F-PqxDE5U,2262
+qontract_reconcile-0.10.1rc939.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc939.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc939.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc939.dist-info/RECORD,,

reconcile/ocm_groups.py

@@ -13,6 +13,7 @@ from reconcile import (
 from reconcile.status import ExitCodes
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import OCMMap
+from reconcile.utils.ocm.base import OCMClusterGroupId
 
 QONTRACT_INTEGRATION = "ocm-groups"
 
@@ -76,9 +77,12 @@ def run(dry_run, thread_pool_size=10):
     ocm_map, current_state = fetch_current_state(clusters, thread_pool_size)
     desired_state = openshift_groups.fetch_desired_state(clusters=ocm_map.clusters())
 
-    # we only manage dedicated-admins via OCM
-    current_state = [s for s in current_state if s["group"] == "dedicated-admins"]
-    desired_state = [s for s in desired_state if s["group"] == "dedicated-admins"]
+    current_state = [
+        s for s in current_state if s["group"] in OCMClusterGroupId.values()
+    ]
+    desired_state = [
+        s for s in desired_state if s["group"] in OCMClusterGroupId.values()
+    ]
 
     diffs = openshift_groups.calculate_diff(current_state, desired_state)
     openshift_groups.validate_diffs(diffs)
@@ -100,8 +104,9 @@ def early_exit_desired_state(*args, **kwargs) -> dict[str, Any]:
         if integration_is_enabled(QONTRACT_INTEGRATION, c) and _cluster_is_compatible(c)
     ]
     desired_state = openshift_groups.fetch_desired_state(clusters=clusters)
-    # we only manage dedicated-admins via OCM
-    desired_state = [s for s in desired_state if s["group"] == "dedicated-admins"]
+    desired_state = [
+        s for s in desired_state if s["group"] in OCMClusterGroupId.values()
+    ]
 
     return {
         "state": desired_state,

reconcile/openshift_groups.py

@@ -31,6 +31,7 @@ from reconcile.utils.oc_map import (
     OCMap,
     init_oc_map_from_clusters,
 )
+from reconcile.utils.ocm.base import OCMClusterGroupId
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.sharding import is_in_shard
 
@@ -270,16 +271,19 @@ def run(
         defer(oc_map.cleanup)
     desired_state = fetch_desired_state(oc_map.clusters())
 
-    # we only manage dedicated-admins via OCM
     current_state = [
         s
         for s in current_state
-        if not (s["cluster"] in ocm_clusters and s["group"] == "dedicated-admins")
+        if not (
+            s["cluster"] in ocm_clusters and s["group"] in OCMClusterGroupId.values()
+        )
     ]
     desired_state = [
         s
         for s in desired_state
-        if not (s["cluster"] in ocm_clusters and s["group"] == "dedicated-admins")
+        if not (
+            s["cluster"] in ocm_clusters and s["group"] in OCMClusterGroupId.values()
+        )
     ]
 
     ob.publish_cluster_desired_metrics_from_state(

reconcile/utils/ocm/base.py

@@ -64,6 +64,10 @@ class OCMClusterGroupId(Enum):
     DEDICATED_ADMINS = "dedicated-admins"
     CLUSTER_ADMINS = "cluster-admins"
 
+    @classmethod
+    def values(cls) -> list[str]:
+        return [group.value for group in cls]
+
 
 class OCMClusterUser(BaseModel):
     """