qontract-reconcile 0.10.1rc348__py3-none-any.whl → 0.10.1rc350__py3-none-any.whl

{qontract_reconcile-0.10.1rc348.dist-info → qontract_reconcile-0.10.1rc350.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ reconcile/aws_iam_password_reset.py,sha256=NwErtrqgBiXr7eGCAHdtGGOx0S7-4JnSc29Ie
 reconcile/aws_support_cases_sos.py,sha256=i6bSWnlH9fh14P14PjVhFLwNl-q3fD733_rXKM_O51c,2992
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=figtZRuWUvdpdSnkhAqeGvO5dI02TT6J3heyeFhlwqM,5016
-reconcile/cli.py,sha256=IJNdJ8lMJ6bSmrbsWol0s_LDr6beTfJFy7Ll5JVjWJg,78933
+reconcile/cli.py,sha256=DtyfHbwInLcx_oa2IS9BjRAGUdTFpjunolG2aRqBs_g,78893
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=3ttGqCBxyUANnizTVxf8R6zuleZ77YM4YGMW7qSSVl8,4865
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=13s9B8iIqSwu-rS-95QbIMPue_Gli3YMNBct5QjmrVo,4525
@@ -114,7 +114,8 @@ reconcile/terraform_vpc_peerings.py,sha256=LRW3GUaf8g9iZWILBWQukfv6YmEY_3fWpatC_
 reconcile/vault_replication.py,sha256=Bg0pIj-s_1nKM2xWmD3vwnSZOxEYHCM3F6jWwXQMuYk,17259
 reconcile/vpc_peerings_validator.py,sha256=oiYwmQ2yYBobFhIixmHNUP1GxzUADocMPJnCBp3FRFw,7177
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/advanced_upgrade_service.py,sha256=vI1XDgKReL0z3E2dpgbMxPBe9zagClS7tMjKeW3LiJw,20658
+reconcile/aus/advanced_upgrade_service.py,sha256=08DtnQ7i30MZj_kd2aaGPCPuOOIVWDnP14pAUy5N-nw,21683
+reconcile/aus/aus_label_source.py,sha256=X6FD4NYcX27llMUSmmBcCh-pG7U5FnBd0zl-0zwCj2U,4118
 reconcile/aus/base.py,sha256=ToS0WfaH_eX0qM_LcBQSpkBhXjKNWNa-2bKjAY6uz0s,32064
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/metrics.py,sha256=L1kgPaDtNZQcA7b65-lbiXmQmNALZWB9Cp0ibToZrzM,2455
@@ -147,16 +148,16 @@ reconcile/cna/assets/asset.py,sha256=1v51uYSaD1NOc9cI_YxG7h0NOcR1ng-mkmD2UzQ8PXE
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
 reconcile/cna/assets/null.py,sha256=Fby1Fbn7oNRIGNasdyhRDvXJ0ktpxv-pUAPN0lZWSzk,1684
 reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip/integration.py,sha256=ulTWCtw4nBmRkUorfs2qymLBrMLo5A9NxtU1Ezyoveg,6043
-reconcile/glitchtip/reconciler.py,sha256=TwzPjgDpannabeIrZu3h1yH13Z08DxRPo61BRJBDESM,12339
+reconcile/glitchtip/integration.py,sha256=kkag8hcVbUSFDrLVEvpJjqXz3O1HkKtzF8HOZ5jKVTU,8191
+reconcile/glitchtip/reconciler.py,sha256=_Lsu5_LRqSfjYe3Tn0eGE-u8WmTJt3c2TgCRvURoEM0,12306
 reconcile/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_alerts/integration.py,sha256=u_HPhzID-oNh1J08X88Q7RRmZNObGlYVCzgrnJGgcoc,9176
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=IvFlSYumDPhUw7gLfFX1P8tg-7Vns0ot2-Nqf2_sE18,7997
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=cGRVXc3tGiK9uCeT6-1ryU-7ykBUwdpZTW4JXAMHHiM,3870
-reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=s5r6dNRv69feeLF5NtH1V_caJYSlIxOgXnC79bjSF_w,2942
+reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=RSgN-BpYC1XG_4yaLdanUGsjBwh0RGLiEFX9T_Z_cvM,4091
+reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=lBX4jCQzKBX32s_2-gprc8PF-vStS_dXIx-Zk38v1w0,3103
 reconcile/gql_definitions/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/aws_ami_cleanup/asg_namespaces.py,sha256=hu0f4DQ5a6mP4L27DR9vbh01tuKYFS-vBE-PttOnFHE,3746
 reconcile/gql_definitions/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -194,11 +195,12 @@ reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py,sha256=Ch938CdCbb
 reconcile/gql_definitions/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/dynatrace_token_provider/dynatrace_bootstrap_tokens.py,sha256=kcnF1mcwb5k8s1pxANBN92sqUcM5KDxOgFGNqHmlPP8,2063
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/fragments/aus_organization.py,sha256=DKizEsoI0Gar4u3rlrr6ylxEJobYJurw8-817kVw3fE,4206
+reconcile/gql_definitions/fragments/aus_organization.py,sha256=1-3gcqTZc2nRExWXvBgeaqsGmECJUKXuTj25soMq8oY,4196
 reconcile/gql_definitions/fragments/aws_account_common.py,sha256=o3bFpDv1edWfVSFPz051INs_Tiy9dovKNyLoEPJzNms,2352
 reconcile/gql_definitions/fragments/aws_infra_management_account.py,sha256=IuXBBDc0GHPvbw7TZcTM750L1gl8Rkqgf3Cco_YPe2w,1258
 reconcile/gql_definitions/fragments/deplopy_resources.py,sha256=QMBZvtAxwy5E7h7Du5QFwIqHbRhnGYV8Izl4b9aQY1s,1093
 reconcile/gql_definitions/fragments/jumphost_common_fields.py,sha256=yQYTbQs9yQDO9Vs-pv_99e_dSq48_SwUVpotRfFlihM,1038
+reconcile/gql_definitions/fragments/minimal_ocm_organization.py,sha256=Pyf6Agvb6kxF8_BZAGojQF5WMiYT9V8R2D8hfLnCpsg,735
 reconcile/gql_definitions/fragments/oc_connection_cluster.py,sha256=L8v52wkcHpnFvDzjHi2FPRmBWa7BhDAIiCqk02nPaGc,1557
 reconcile/gql_definitions/fragments/ocm_environment.py,sha256=DOfBY4fb02UF5R3ZxtwHBTlxhPYOOBJaqGeENElX7oc,1037
 reconcile/gql_definitions/fragments/pipeline_provider_retention.py,sha256=aAFIPiaDNvVTnocIQ3SH8_1Itu0UXQi8XZ0yOrKfbRw,761
@@ -216,7 +218,7 @@ reconcile/gql_definitions/gitlab_members/gitlab_instances.py,sha256=2pLJMX5VngtQ
 reconcile/gql_definitions/gitlab_members/permissions.py,sha256=eQ1A22jnPMs2aCioS_u2Fw9wkMy9wsU_RuunPt4uu6I,3320
 reconcile/gql_definitions/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/glitchtip/glitchtip_instance.py,sha256=Dyqs6tFaixcxUJR8TA3PZJ0GXtQL1tegiGFv2aAHXj0,2181
-reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=J8eWLmsbs61kw1gv0PGgvFMhZm4S_863eixVP1GIcwA,5642
+reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=TTfg3TDkAnEOwidgq_BsvnFLwwfl9kZvnl4Hp_fVeqU,5990
 reconcile/gql_definitions/glitchtip/glitchtip_settings.py,sha256=triKpfVwYxXWyZaZ6r7B37brzbqncjb2vhlBO_33phY,2058
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=NYffd2Y8Q_fAwLeEvWvBDwHHMp49vQp2udu-uX4de50,3816
@@ -231,9 +233,10 @@ reconcile/gql_definitions/jumphosts/jumphosts.py,sha256=V0K6V9_O8LFztCcBtJfaZ9PM
 reconcile/gql_definitions/ldap_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/ldap_groups/roles.py,sha256=-mww5_wvNxknYQpx2xK9HHyvDvXSGKkEVaDapIp2YoE,1929
 reconcile/gql_definitions/ldap_groups/settings.py,sha256=Zq9moBWsL03RgoBEjkvLzz_eCimeD8ANxn3secqFOGw,2237
+reconcile/gql_definitions/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+reconcile/gql_definitions/ocm_labels/clusters.py,sha256=NARPaQjcF4iVkX_AF905CNQyjmyTohSktc8Kvp6aJRY,2909
+reconcile/gql_definitions/ocm_labels/organizations.py,sha256=zCEiVUoVmaNOWUIYDh0yQDD9ov9mKGw1QhUXA89NZCg,2019
 reconcile/gql_definitions/ocm_oidc_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/ocm_subscription_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/ocm_subscription_labels/clusters.py,sha256=rXniwpBJQJtQB8OVYU25YgFukf0ijH0O0wfJzHirHlM,2729
 reconcile/gql_definitions/openshift_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_groups/managed_groups.py,sha256=_Cr0z4BJlWF0MjMEphWIKqpvyfIXSW8MiEs86sAtyZQ,2017
 reconcile/gql_definitions/openshift_groups/managed_roles.py,sha256=Q9U2hRiAZiCBEHmT1ipHhS2z1Yn5VIXvpIxNJgNrw_Y,2607
@@ -281,11 +284,12 @@ reconcile/gql_definitions/vpc_peerings_validator/vpc_peerings_validator_peered_c
 reconcile/jenkins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/jenkins/types.py,sha256=0UlyJxv3KY1WXHkfI_ghUI6FAwRJTL4EwvLg-62tNcg,3001
 reconcile/ldap_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/ldap_groups/integration.py,sha256=O3BN_zSP2mXOHLIXpCj2mYcJ08or-LduQXWnLWomPEw,7818
+reconcile/ldap_groups/integration.py,sha256=SLcvBYQK2i7YONLxMQfjd3AdtfSSp4I_AvSIRGM8yXc,7830
 reconcile/ocm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm/types.py,sha256=NOM_On4tEx2lwpZCbYrSwpysHcm6QvLfpdWpxiN_5KE,2183
-reconcile/ocm_subscription_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/ocm_subscription_labels/integration.py,sha256=N7ZNmycIQUQtqCNTb1cx9rVFxv3q0OrFiG3JBCSup-4,8720
+reconcile/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+reconcile/ocm_labels/integration.py,sha256=1yi-hCagI2XqRxjIVVC6jiMJj7VN_Efk4IkqZKke5jI,15008
+reconcile/ocm_labels/label_sources.py,sha256=z5Rg5uMTfRkTi3QbEQK1P82LLciWrSnp65XBEpZf2-o,1877
 reconcile/oum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/oum/base.py,sha256=gw5qDx3VKtIk-VW_g0j5iPdM4qAweqy0YROHJhKHt0M,13596
 reconcile/oum/labelset.py,sha256=MTOMEyBMbge3JOq0mOKWja-kV3cs0ZId9Ozxv7FJ9Kw,2185
@@ -558,7 +562,7 @@ reconcile/utils/ocm/base.py,sha256=VOoFEjRRjQ70zNDvlb6YJ8jnpsCZVU7T5yiztP9xjx0,1
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=BdYEHs83MB4yMNjilpoOWQ2J2zE0pmhCy3lsbUJnaKo,6550
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
-reconcile/utils/ocm/labels.py,sha256=68TT7ViGhUr2aGOkWpOjJrd2uORwCCSbzpVs3Vb4ucw,4126
+reconcile/utils/ocm/labels.py,sha256=iAsykGGEwWNKAuvjtSRejVekTQ_urjFxc75PRTARWOY,5920
 reconcile/utils/ocm/ocm.py,sha256=AA9KRZqVRAsqwlLh-UDuH4Gh_w-r5rTSsdsIjakWsGQ,58338
 reconcile/utils/ocm/search_filters.py,sha256=zExZpYBh7_tucG-xKoPHUxz1b_6l9qwbEMpMihQg7nA,15043
 reconcile/utils/ocm/service_log.py,sha256=juMLO3iudrv0pn9sG68rs4HBfd5TgjOiK_TPdOnOa0w,1630
@@ -592,7 +596,7 @@ release/version.py,sha256=Ud36t9FxGHLubMrE2o5aaaZRGB9_9hU_z0RN9go0TQM,3876
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/app_interface_reporter.py,sha256=8HUH8kkW50-plKgiTgCiFINJNN_cl4ZFzmY4aSnRaNk,18270
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
-tools/glitchtip_access_revalidation.py,sha256=PXN5wxl6OX8sxddPaakDF3X79nFLvpm-lz0mWLVelw0,2806
+tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
 tools/qontract_cli.py,sha256=oXeUs9wMv7S3u4CzmnAXuK8nn9bcmMB2873lzeEwMlE,96717
 tools/sd_app_sre_alert_report.py,sha256=utFZCreITuTZTiOaFNCaVPyFK0zxFZbc_ElcngGbiW8,4346
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -603,8 +607,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc348.dist-info/METADATA,sha256=y1ofrl5N-yeauO2A22a1zuVMPZTywqOUPdQ09M_MysU,2347
-qontract_reconcile-0.10.1rc348.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc348.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc348.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc348.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc350.dist-info/METADATA,sha256=hyazkojCTs415shSZg18vJN8MKMmXtzFIeEE88a59Yk,2347
+qontract_reconcile-0.10.1rc350.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+qontract_reconcile-0.10.1rc350.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
+qontract_reconcile-0.10.1rc350.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc350.dist-info/RECORD,,

reconcile/aus/advanced_upgrade_service.py

@@ -24,7 +24,9 @@ from reconcile.gql_definitions.fragments.aus_organization import (
     OpenShiftClusterManagerSectorV1,
     OpenShiftClusterManagerV1_OpenShiftClusterManagerV1,
     OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManagerEnvironmentV1,
-    OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManagerV1,
+)
+from reconcile.gql_definitions.fragments.minimal_ocm_organization import (
+    MinimalOCMOrganization,
 )
 from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.gql_definitions.fragments.upgrade_policy import (
@@ -47,6 +49,7 @@ from reconcile.utils.ocm.clusters import (
     discover_clusters_by_labels,
 )
 from reconcile.utils.ocm.labels import (
+    get_org_labels,
     get_organization_labels,
     subscription_label_filter,
 )
@@ -211,15 +214,14 @@ def _get_org_labels(
     """
     Fetch all AUS OCM org labels from organizations. They hold config
     parameters like blocked versions etc.
+
+    The result is a dict with organization IDs as keys and label containers as values.
     """
-    filter = Filter().like("key", aus_label_key("%")).is_in("organization_id", org_ids)
-    labels_by_org: dict[str, list[OCMOrganizationLabel]] = defaultdict(list)
-    for label in get_organization_labels(ocm_api, filter):
-        labels_by_org[label.organization_id].append(label)
-    return {
-        org_id: build_label_container(labels)
-        for org_id, labels in labels_by_org.items()
-    }
+    return get_org_labels(
+        ocm_api=ocm_api,
+        org_ids=org_ids or set(),
+        label_filter=Filter().like("key", aus_label_key("%")),
+    )
 
 
 def _build_org_upgrade_specs_for_ocm_env(
@@ -245,7 +247,7 @@ def _build_org_upgrade_specs_for_ocm_env(
     }
 
 
-def aus_label_key(config_atom: str) -> str:
+def aus_label_key(config_atom: Optional[str] = None) -> str:
     """
     Generates label keys for aus, compliant with the naming schema defined in
     https://service.pages.redhat.com/dev-guidelines/docs/sre-capabilities/framework/ocm-labels/
@@ -315,9 +317,7 @@ def _build_org_upgrade_spec(
                     name=source_org_ref.env_name
                 ),
                 publishVersionData=[
-                    OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManagerV1(
-                        orgId=org.id
-                    )
+                    MinimalOCMOrganization(orgId=org.id, name=org.name)
                 ],
             )
             for source_org_ref in version_data_inheritance.inherit_from_orgs
@@ -337,6 +337,7 @@ def _build_org_upgrade_spec(
             accessTokenUrl=None,
             addonUpgradeTests=None,
             inheritVersionData=inherit_version_data,
+            publishVersionData=None,
             upgradePolicyAllowedWorkloads=None,
             upgradePolicyClusters=None,
         )
@@ -390,6 +391,42 @@ class ClusterUpgradePolicyLabelSet(BaseModel):
     blocked_versions: Optional[CSV] = Field(alias=aus_label_key("blocked-versions"))
     _schedule_validator = validator("schedule", allow_reuse=True)(cron_validator)
 
+    def build_labels_dict(self) -> dict[str, str]:
+        """
+        Build a dictionary of all labels in this labelset.
+        """
+        labels = {}
+        for k, v in self.dict(by_alias=True).items():
+            if v is None:
+                continue
+            if isinstance(v, list):
+                labels[k] = ",".join(sorted(v))
+            else:
+                labels[k] = str(v)
+        return labels
+
+
+def build_cluster_upgrade_policy_label_set(
+    workloads: list[str],
+    schedule: str,
+    soak_days: int,
+    mutexes: Optional[list[str]] = None,
+    sector: Optional[str] = None,
+    blocked_versions: Optional[list[str]] = None,
+) -> ClusterUpgradePolicyLabelSet:
+    return ClusterUpgradePolicyLabelSet(
+        **{
+            aus_label_key("workloads"): ",".join(workloads),
+            aus_label_key("schedule"): schedule,
+            aus_label_key("soak-days"): soak_days,
+            aus_label_key("mutexes"): ",".join(mutexes) if mutexes else None,
+            aus_label_key("sector"): sector,
+            aus_label_key("blocked-versions"): ",".join(blocked_versions)
+            if blocked_versions
+            else None,
+        }
+    )
+
 
 def _build_policy_from_labels(labels: LabelContainer) -> ClusterUpgradePolicyV1:
     """

reconcile/aus/aus_label_source.py

@@ -0,0 +1,115 @@
+from collections.abc import Iterable
+from typing import Callable
+
+from reconcile.aus.advanced_upgrade_service import (
+    aus_label_key,
+    build_cluster_upgrade_policy_label_set,
+)
+from reconcile.gql_definitions.advanced_upgrade_service.aus_clusters import (
+    ClusterUpgradePolicyV1,
+    ClusterV1,
+)
+from reconcile.gql_definitions.advanced_upgrade_service.aus_clusters import (
+    query as aus_clusters_query,
+)
+from reconcile.gql_definitions.advanced_upgrade_service.aus_organization import (
+    query as aus_organizations_query,
+)
+from reconcile.gql_definitions.fragments.aus_organization import AUSOCMOrganization
+from reconcile.ocm_labels.label_sources import (
+    ClusterRef,
+    LabelSource,
+    LabelState,
+    OrgRef,
+)
+
+
+class AUSClusterUpgradePolicyLabelSource(LabelSource):
+    def __init__(self, clusters: Iterable[ClusterV1]) -> None:
+        self.clusters = clusters
+
+    def get_labels(self) -> LabelState:
+        return {
+            ClusterRef(
+                cluster_id=cluster.spec.q_id,
+                org_id=cluster.ocm.org_id,
+                ocm_env=cluster.ocm.environment.name,
+                name=cluster.name,
+                label_container_href=None,
+            ): self._cluster_to_labels(cluster.upgrade_policy)
+            for cluster in self.clusters
+            if cluster.ocm
+            and cluster.spec
+            and cluster.spec.q_id
+            and cluster.upgrade_policy
+        }
+
+    def _cluster_to_labels(self, policy: ClusterUpgradePolicyV1) -> dict[str, str]:
+        return build_cluster_upgrade_policy_label_set(
+            workloads=policy.workloads,
+            schedule=policy.schedule,
+            soak_days=policy.conditions.soak_days or 0,
+            mutexes=policy.conditions.mutexes,
+            sector=policy.conditions.sector,
+            blocked_versions=policy.conditions.blocked_versions,
+        ).build_labels_dict()
+
+
+def init_aus_cluster_label_source(
+    query_fun: Callable,
+) -> LabelSource:
+    clusters = aus_clusters_query(query_func=query_fun).clusters or []
+    return AUSClusterUpgradePolicyLabelSource(clusters=clusters)
+
+
+class AUSOrganizationLabelSource(LabelSource):
+    def __init__(self, organizations: Iterable[AUSOCMOrganization]) -> None:
+        self.organizations = organizations
+
+    def get_labels(self) -> LabelState:
+        return {
+            OrgRef(
+                org_id=organization.org_id,
+                ocm_env=organization.environment.name,
+                label_container_href=None,
+                name=organization.name,
+            ): self._organization_to_labels(organization)
+            for organization in self.organizations
+        }
+
+    def _organization_to_labels(
+        self, organization: AUSOCMOrganization
+    ) -> dict[str, str]:
+        labels: dict[str, str] = {}
+        # blocked versions
+        if organization.blocked_versions:
+            labels[aus_label_key("blocked-versions")] = ",".join(
+                organization.blocked_versions
+            )
+        # sector dependencies
+        for sector in organization.sectors or []:
+            if sector.dependencies:
+                labels[aus_label_key(f"sectors.{sector.name}")] = ",".join(
+                    sorted([dep.name for dep in sector.dependencies])
+                )
+        # version-data sharing
+        if organization.inherit_version_data:
+            labels[aus_label_key("version-data.inherit")] = ",".join(
+                sorted(
+                    inherit.org_id
+                    for inherit in organization.inherit_version_data or []
+                )
+            )
+        if organization.publish_version_data:
+            labels[aus_label_key("version-data.publish")] = ",".join(
+                sorted(
+                    publish.org_id
+                    for publish in organization.publish_version_data or []
+                )
+            )
+        return labels
+
+
+def init_aus_org_label_source(query_fun: Callable) -> LabelSource:
+    organizations = aus_organizations_query(query_func=query_fun).organizations or []
+    return AUSOrganizationLabelSource(organizations=organizations)

reconcile/cli.py

@@ -2803,17 +2803,17 @@ def skupper_network(ctx, thread_pool_size, internal, use_jump_host):
     )
 
 
-@integration.command(short_help="Manage cluster OCM subscription labels.")
+@integration.command(short_help="Manage cluster OCM labels.")
 @click.option(
     "--managed-label-prefixes",
     help="A comma list of label prefixes that are managed.",
     required=True,
-    envvar="OSL_MANAGED_LABEL_PREFIXES",
+    envvar="OL_MANAGED_LABEL_PREFIXES",
     default="sre-capabilities",
 )
 @click.pass_context
-def ocm_subscription_labels(ctx, managed_label_prefixes):
-    from reconcile.ocm_subscription_labels.integration import (
+def ocm_labels(ctx, managed_label_prefixes):
+    from reconcile.ocm_labels.integration import (
         OcmLabelsIntegration,
         OcmLabelsIntegrationParams,
     )

reconcile/glitchtip/integration.py

@@ -1,4 +1,5 @@
 from collections.abc import (
+    Callable,
     Iterable,
     Sequence,
 )
@@ -24,11 +25,13 @@ from reconcile.gql_definitions.glitchtip.glitchtip_project import (
 from reconcile.gql_definitions.glitchtip.glitchtip_project import (
     query as glitchtip_project_query,
 )
+from reconcile.ldap_groups.integration import LdapGroupsIntegration
 from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
 from reconcile.typed_queries.glitchtip_settings import get_glitchtip_settings
 from reconcile.utils import gql
+from reconcile.utils.defer import defer
 from reconcile.utils.glitchtip import (
     GlitchtipClient,
     Organization,
@@ -36,9 +39,14 @@ from reconcile.utils.glitchtip import (
     Team,
     User,
 )
-from reconcile.utils.secret_reader import create_secret_reader
+from reconcile.utils.internal_groups.client import InternalGroupsClient
+from reconcile.utils.secret_reader import (
+    SecretReaderBase,
+    create_secret_reader,
+)
 
 QONTRACT_INTEGRATION = "glitchtip"
+DEFAULT_MEMBER_ROLE = "member"
 
 
 def filter_users(users: Iterable[User], ignore_users: Iterable[str]) -> list[User]:
@@ -50,7 +58,7 @@ def get_user_role(organization: Organization, roles: RoleV1) -> str:
         if role.organization.name == organization.name:
             return role.role
     # this can not be reached due to GQL but makes mypy happy
-    return "member"
+    return DEFAULT_MEMBER_ROLE
 
 
 class GlitchtipException(Exception):
@@ -79,7 +87,9 @@ def fetch_current_state(
 
 
 def fetch_desired_state(
-    glitchtip_projects: Sequence[GlitchtipProjectsV1], mail_domain: str
+    glitchtip_projects: Sequence[GlitchtipProjectsV1],
+    mail_domain: str,
+    internal_groups_client: InternalGroupsClient,
 ) -> list[Organization]:
     organizations: dict[str, Organization] = {}
     for glitchtip_project in glitchtip_projects:
@@ -97,6 +107,8 @@ def fetch_desired_state(
             raise GlitchtipException(f'project name "{project.name}" already in use!')
         for glitchtip_team in glitchtip_project.teams:
             users: list[User] = []
+
+            # Get users via roles
             for role in glitchtip_team.roles:
                 for role_user in role.users:
                     users.append(
@@ -106,7 +118,19 @@ def fetch_desired_state(
                         )
                     )
 
-            team = Team(name=glitchtip_team.name, users=users)
+            # Get users via ldap
+            for ldap_group in glitchtip_team.ldap_groups or []:
+                for member in internal_groups_client.group(ldap_group).members:
+                    users.append(
+                        User(
+                            email=f"{member.id}@{mail_domain}",
+                            role=glitchtip_team.members_organization_role
+                            or DEFAULT_MEMBER_ROLE,
+                        )
+                    )
+
+            # set(users) will take the first occurrence of a user, so the users from roles will be preferred
+            team = Team(name=glitchtip_team.name, users=set(users))
             project.teams.append(team)
             if team not in organization.teams:
                 organization.teams.append(team)
@@ -118,16 +142,47 @@ def fetch_desired_state(
     return list(organizations.values())
 
 
-def run(dry_run: bool, instance: Optional[str] = None) -> None:
+def get_glitchtip_projects(query_func: Callable) -> list[GlitchtipProjectsV1]:
+    glitchtip_projects = (
+        glitchtip_project_query(query_func=query_func).glitchtip_projects or []
+    )
+    for project in glitchtip_projects:
+        # either org.owners or project.app must be set
+        if not project.organization.owners and not project.app:
+            raise ValueError(
+                f"Either owners in organization {project.organization.name} or app must be set for project {project.name}"
+            )
+
+    return glitchtip_projects
+
+
+def get_internal_groups_client(
+    query_func: Callable, secret_reader: SecretReaderBase
+) -> InternalGroupsClient:
+    ldap_groups_settings = LdapGroupsIntegration.get_integration_settings(query_func)
+    secret = secret_reader.read_all_secret(ldap_groups_settings.credentials)
+    return InternalGroupsClient(
+        secret["api_url"],
+        secret["issuer_url"],
+        secret["client_id"],
+        secret["client_secret"],
+    )
+
+
+@defer
+def run(
+    dry_run: bool, instance: Optional[str] = None, defer: Optional[Callable] = None
+) -> None:
     gqlapi = gql.get_api()
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     read_timeout, max_retries, mail_domain = get_glitchtip_settings()
+    internal_groups_client = get_internal_groups_client(gqlapi.query, secret_reader)
+    if defer:
+        defer(internal_groups_client.close)
 
     glitchtip_instances = glitchtip_instance_query(query_func=gqlapi.query).instances
-    glitchtip_projects = (
-        glitchtip_project_query(query_func=gqlapi.query).glitchtip_projects or []
-    )
+    glitchtip_projects = get_glitchtip_projects(query_func=gqlapi.query)
 
     for glitchtip_instance in glitchtip_instances:
         if instance and glitchtip_instance.name != instance:
@@ -153,6 +208,7 @@ def run(dry_run: bool, instance: Optional[str] = None) -> None:
                 if p.organization.instance.name == glitchtip_instance.name
             ],
             mail_domain=mail_domain,
+            internal_groups_client=internal_groups_client,
         )
 
         reconciler = GlitchtipReconciler(glitchtip_client, dry_run)

reconcile/glitchtip/reconciler.py

@@ -228,9 +228,7 @@ class GlitchtipReconciler:
                     continue
                 self.client.delete_user(organization_slug=organization_slug, pk=user.pk)
         for user in set(desired_users).difference(current_users):
-            logging.info(
-                ["invite_user", organization_slug, user.email, self.client.host]
-            )
+            logging.info(["add_user", organization_slug, user.email, self.client.host])
             if not self.dry_run:
                 new_user = self.client.invite_user(
                     organization_slug=organization_slug,

reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py

@@ -54,9 +54,12 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
       name
     }
     publishVersionData {
-      orgId
+      ... MinimalOCMOrganization
     }
   }
+  publishVersionData {
+    ... MinimalOCMOrganization
+  }
   sectors {
     name
     dependencies {
@@ -86,6 +89,11 @@ fragment ClusterUpgradePolicyV1 on ClusterUpgradePolicy_v1 {
   }
 }
 
+fragment MinimalOCMOrganization on OpenShiftClusterManager_v1 {
+  name
+  orgId
+}
+
 fragment OCMEnvironment on OpenShiftClusterManagerEnvironment_v1 {
     name
     url
@@ -114,6 +122,7 @@ query AUSClusters($name: String) {
     }
     spec {
         product
+        id
         external_id
         version
     }
@@ -133,6 +142,7 @@ class ConfiguredBaseModel(BaseModel):
 
 class ClusterSpecV1(ConfiguredBaseModel):
     product: str = Field(..., alias="product")
+    q_id: Optional[str] = Field(..., alias="id")
     external_id: Optional[str] = Field(..., alias="external_id")
     version: str = Field(..., alias="version")
 

reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py

@@ -53,9 +53,12 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
       name
     }
     publishVersionData {
-      orgId
+      ... MinimalOCMOrganization
     }
   }
+  publishVersionData {
+    ... MinimalOCMOrganization
+  }
   sectors {
     name
     dependencies {
@@ -85,6 +88,11 @@ fragment ClusterUpgradePolicyV1 on ClusterUpgradePolicy_v1 {
   }
 }
 
+fragment MinimalOCMOrganization on OpenShiftClusterManager_v1 {
+  name
+  orgId
+}
+
 fragment OCMEnvironment on OpenShiftClusterManagerEnvironment_v1 {
     name
     url

reconcile/gql_definitions/fragments/aus_organization.py

@@ -18,6 +18,9 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 )
 
 from reconcile.gql_definitions.fragments.upgrade_policy import ClusterUpgradePolicyV1
+from reconcile.gql_definitions.fragments.minimal_ocm_organization import (
+    MinimalOCMOrganization,
+)
 from reconcile.gql_definitions.fragments.ocm_environment import OCMEnvironment
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
@@ -49,23 +52,15 @@ class OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManage
     name: str = Field(..., alias="name")
 
 
-class OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManagerV1(
-    ConfiguredBaseModel
-):
-    org_id: str = Field(..., alias="orgId")
-
-
 class OpenShiftClusterManagerV1_OpenShiftClusterManagerV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     org_id: str = Field(..., alias="orgId")
     environment: OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManagerEnvironmentV1 = Field(
         ..., alias="environment"
     )
-    publish_version_data: Optional[
-        list[
-            OpenShiftClusterManagerV1_OpenShiftClusterManagerV1_OpenShiftClusterManagerV1
-        ]
-    ] = Field(..., alias="publishVersionData")
+    publish_version_data: Optional[list[MinimalOCMOrganization]] = Field(
+        ..., alias="publishVersionData"
+    )
 
 
 class OpenShiftClusterManagerSectorDependenciesV1_OpenShiftClusterManagerV1(
@@ -110,6 +105,9 @@ class AUSOCMOrganization(ConfiguredBaseModel):
     inherit_version_data: Optional[
         list[OpenShiftClusterManagerV1_OpenShiftClusterManagerV1]
     ] = Field(..., alias="inheritVersionData")
+    publish_version_data: Optional[list[MinimalOCMOrganization]] = Field(
+        ..., alias="publishVersionData"
+    )
     sectors: Optional[list[OpenShiftClusterManagerSectorV1]] = Field(
         ..., alias="sectors"
     )