qontract-reconcile 0.10.1rc365__py3-none-any.whl → 0.10.1rc367__py3-none-any.whl

{qontract_reconcile-0.10.1rc365.dist-info → qontract_reconcile-0.10.1rc367.dist-info}/METADATA

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

@@ -8,7 +8,7 @@ reconcile/aws_support_cases_sos.py,sha256=i6bSWnlH9fh14P14PjVhFLwNl-q3fD733_rXKM
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=figtZRuWUvdpdSnkhAqeGvO5dI02TT6J3heyeFhlwqM,5016
 reconcile/cli.py,sha256=tUBFXkQJZqakjGQI3VOB_MtPmO4xjJqkS_9JkPyvTfI,79269
-reconcile/closedbox_endpoint_monitoring_base.py,sha256=3ttGqCBxyUANnizTVxf8R6zuleZ77YM4YGMW7qSSVl8,4865
+reconcile/closedbox_endpoint_monitoring_base.py,sha256=GmEdDSp9yBnwpzzrla6VJfhOZd_qxYh-xtIN5bXjOBo,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=13s9B8iIqSwu-rS-95QbIMPue_Gli3YMNBct5QjmrVo,4525
 reconcile/dashdotdb_cso.py,sha256=FoXrWGpOwXG5jf0eklN84tjJVUAYzKat7rtq_28JMlQ,3672
@@ -17,7 +17,7 @@ reconcile/dashdotdb_dvo.py,sha256=YXqpI6fBQAql-ybGI0grj9gWMzmKiAvPE__pNju6obk,89
 reconcile/dashdotdb_slo.py,sha256=oiWMehzU5wTk2AkYmOzD34vCvIFKCzuy0WDLrA3Kjzc,5823
 reconcile/dynatrace_token_provider.py,sha256=HWItJ_LavPcUJlpYz5fmfnfOpP2-0Qjkar0EAzBJ5Cw,16602
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
-reconcile/gabi_authorized_users.py,sha256=gegGTuB6WEVAPrJ_B3D8HfD0xYCJuY0oTkcF5k5s8Vw,4293
+reconcile/gabi_authorized_users.py,sha256=rCosZv8Iu9jhWG88YiwK-gftX475aJ1R-PYIJYp_svY,4342
 reconcile/gcr_mirror.py,sha256=TtWI8qVUku9OQwJ_TpFyfVviswVFoEmCtdhLKLkFHKk,8409
 reconcile/github_org.py,sha256=t0oEk4XPMiOLpVvPockMVeBVdmZShXj6Ol7wUISFrT4,13479
 reconcile/github_owners.py,sha256=QWX-BX3-sHAPnVAR2fZXUTgIdWnfMDDyalcZINr6i1s,2949
@@ -33,7 +33,7 @@ reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4
 reconcile/gitlab_owners.py,sha256=8ukww7OSH2nWI30ylOKj7-6U-jVhV7ztRPsLhOxcVdg,13794
 reconcile/gitlab_permissions.py,sha256=ciEKj_wnRbS_vs_ZwcUeD6HkWVe3osAuotFqJSmvd94,1638
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
-reconcile/integrations_manager.py,sha256=zUCh1bYrnNoT_6SSQO-yYA2QdDxfCuzwb1tjcByIOaE,8885
+reconcile/integrations_manager.py,sha256=2h3E0Q-vGlLbeK6e9tO8gMVRbtCM1cn3l9ZB9xKRTZo,9407
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
 reconcile/jenkins_job_builder.py,sha256=8mcvvkPvcgw0hZnYTcuh9P-ltSHwqg8zihXh7oxGuzI,3957
 reconcile/jenkins_job_builds_cleaner.py,sha256=zK8gQgXY5Ab5aDk8yPiXg0ogUEBOGmbyo8wEEtK342k,3190
@@ -57,14 +57,14 @@ reconcile/ocm_groups.py,sha256=_kiMUndKc6as6cbbvXxVnq8V_Lj7X5lxMJVCuRWuUFE,2888
 reconcile/ocm_machine_pools.py,sha256=asQ2lmFQPyFpxvA5uVBeC2aKBgIPIPQOx_WKgl1r8Xk,15260
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=7j5fxPLZQuhlxfhSRCnSnIJhUoysTwvhJ422vWqfVeo,4015
-reconcile/openshift_base.py,sha256=bJiM-9IK2I_-aQHuu8iWjPs22d-fEUZKq-DavRIz_l8,53908
+reconcile/openshift_base.py,sha256=RLEhlkvr-4E_tJW4ptH0XEAUZmMjB9YV5ppRGIsceMU,54581
 reconcile/openshift_clusterrolebindings.py,sha256=9lBO2INBDCCtDpoj29NuOPbbpdJUXf-_LQIrhiLmmns,5827
-reconcile/openshift_groups.py,sha256=DL-H9UXHAnHjDNZl87MMDTStZ11p1T2utM_1TGNVqic,10324
-reconcile/openshift_limitranges.py,sha256=SZkHhGS3m9oBUkzcclRiszfLEB7jQ8z8xh9P2Y8KTzg,3393
+reconcile/openshift_groups.py,sha256=i6xh4hv8-4CBw7eZQbMwMrr8QPySxaahRjyzE8IjtVo,9531
+reconcile/openshift_limitranges.py,sha256=UvCGo_OQ4XoDK55TJmn55qEhhlkhLzhU12tX8nT5kPQ,3442
 reconcile/openshift_namespace_labels.py,sha256=rRrmLuHpBpMG6dAhWd6FveVV994aByMQFWywMxOHu1o,15776
-reconcile/openshift_namespaces.py,sha256=i7_R_J-IeFgu16N9VgTQqfxZpbuAMzMUn4i74YmGQPQ,5584
-reconcile/openshift_network_policies.py,sha256=NU5svhqm_lct1bQxFAzoKoIBjtmCrzAoSMzQUnbM9Qc,4188
-reconcile/openshift_resourcequotas.py,sha256=7Oy2p_iQ6PMb4eKvsfRVQqrOyE8MxOifZ-FYAiv2zF0,2366
+reconcile/openshift_namespaces.py,sha256=mcWsMRoHPPS0TNMguGka7Q0fLl0Rj7rzypX98K2dRpM,5737
+reconcile/openshift_network_policies.py,sha256=_9Xt0ERUknGh4F41PnJQ_a9Weam2vA_hOBny9SPwKag,4237
+reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=kwsY5cko7udEKNlhL2oKiKv_5wzEw9wmmwROE016ng8,1400
 reconcile/openshift_resources_base.py,sha256=7I82p9hVlAvUayDcX8CfGgPbA4txyz4FnOgvuZ0b8LQ,44926
 reconcile/openshift_rolebindings.py,sha256=K6alhxtnxifnytQKMqIGdVkqGEa28AVwFv4B7SjbgIk,6628
@@ -77,8 +77,8 @@ reconcile/openshift_saas_deploy_trigger_configs.py,sha256=uWzUV5D5CW0frdi1ys7BOb
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=Yl4lMtxqab-c04I2Ju8isAJuYuNTbHN01Bk3dF9nTos,967
 reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=VqjwgRhA-yOSq0WFPqGIJVgYkdq_UrTHcVusBzOFgMY,973
 reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=etfBGj7GDXTOhNHKc40ee5QM0Chq3oHE40HrbWgopc8,971
-reconcile/openshift_serviceaccount_tokens.py,sha256=UlBRjfAxzf9-h4uxQwHqrYnBWMUGFqqfp6KvW2lM76k,6369
-reconcile/openshift_tekton_resources.py,sha256=_-Ujf7e3fAX4jwU7HRZrSY1jwvpwcVwoIQwdohpJkC4,16191
+reconcile/openshift_serviceaccount_tokens.py,sha256=QDj8ZcVxnsG6nVtjDD3UVM2DkRWHubToI-blvYjkncI,6418
+reconcile/openshift_tekton_resources.py,sha256=WpwloHimEBWQmXbNrcZPAvNdymR8IFNNefOac-W2QHg,16276
 reconcile/openshift_upgrade_watcher.py,sha256=KxJIBudfX0DcpSH1_evbz4gNMQi0yeOpSZLgKrs-FBw,6618
 reconcile/openshift_users.py,sha256=dKWS3AVmgMKcblafHYz1pLVnTOp1ZzfePGQCaTpVc_8,5213
 reconcile/openshift_vault_secrets.py,sha256=9rTqV6wzCQx2Oh712E_Xj8wMG7u8Oh-pY8DWjlv4mZw,1660
@@ -104,10 +104,10 @@ reconcile/status_board.py,sha256=xOKicOelyGv3h2sFJxa9FBj8HDroZyGhMaRWaNRGpQQ,810
 reconcile/template_tester.py,sha256=vZz8GM46waQUGd3OVnhW5OLTqctFMH_Hh1QXxT5hduM,2384
 reconcile/terraform_aws_route53.py,sha256=QJMlaYYwcw_N9TJu7VbgZfxrxxR8Wv62GuG05XVhSuE,10018
 reconcile/terraform_cloudflare_dns.py,sha256=auU4bzeLwd4S8D8oqpqJbrCUoEdELXrgi7vHOedjYFk,13332
-reconcile/terraform_cloudflare_resources.py,sha256=JAwqaryFUSE4BA_1xBpea5900J1Gsb3bUEtkAjrZSv8,15044
+reconcile/terraform_cloudflare_resources.py,sha256=m4Xg3xmHa7XjbUEvAbg0a3BeRSnPLe-4CLUJPlQiTdc,15012
 reconcile/terraform_cloudflare_users.py,sha256=DfeSnYC9YQgXX6AbJh85tQbJUDv1e2FjiGXgcpVQlPg,13964
 reconcile/terraform_repo.py,sha256=fIVjcxqhG6DR6H8QtQM1RpE9ukanjkjp8iH0tQRhEl8,13042
-reconcile/terraform_resources.py,sha256=-VWkI-0EwNUovNcLksFBkYmAMZoB9GM_QG1pZa9ZMrg,17136
+reconcile/terraform_resources.py,sha256=WUM0ZEpf2jgcXjfjy3QSwrzpuD6zMN7cyOxetx88f9g,17167
 reconcile/terraform_tgw_attachments.py,sha256=6PVhBYeIvNnz2PwBdPF0I222_83EzOWX6VKJnqz7UPo,13915
 reconcile/terraform_users.py,sha256=kXRUxCUchKCP2dbXXOzctynqMii4oyCP6bYZHQTrlTg,10202
 reconcile/terraform_vpc_peerings.py,sha256=LRW3GUaf8g9iZWILBWQukfv6YmEY_3fWpatC_op-66I,21611
@@ -153,7 +153,7 @@ reconcile/glitchtip/reconciler.py,sha256=_Lsu5_LRqSfjYe3Tn0eGE-u8WmTJt3c2TgCRvUR
 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/glitchtip_project_dsn/integration.py,sha256=dQPb_izAXSlHBwksEpiTGgeybIsUsPZ1wJfMZ5voBHY,8046
 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=RSgN-BpYC1XG_4yaLdanUGsjBwh0RGLiEFX9T_Z_cvM,4091
@@ -323,7 +323,7 @@ reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=WXzr6I0Q9NzTU8s2Dk_wd
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=178Q9RSYuZ9NmrCK4jRMLMekrewUaaRdclccI6zBsQ8,10786
 reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq9lj3RU,6663
-reconcile/skupper_network/reconciler.py,sha256=tweho_gZ5dRVQAke124ft4Jue0g-zoD2vtJaFnvtLeQ,10136
+reconcile/skupper_network/reconciler.py,sha256=pfNeyUZLBnOSFu87i-sn_8okj1uCiY1kQWl5Rbt2G9Y,10176
 reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO7XhAH15BHAcS9fk,1550
 reconcile/statuspage/__init__.py,sha256=o9vR6sp3ARDQFZrbCEShelTxjF1XgfLaElK_QVt_248,261
 reconcile/statuspage/atlassian.py,sha256=BQ__HeoEJdkMEGamc1PSgYWbRpXK8j15YrBjytJhl6g,12780
@@ -357,7 +357,7 @@ reconcile/test/test_gitlab_housekeeping.py,sha256=7EpWikaWJH52IlA2PZs7vz4GEgID-_
 reconcile/test/test_gitlab_labeler.py,sha256=vFLUJXSIaCduj6wSqgw7Fg7FhlopaDnYI5SLzNHtLoY,4362
 reconcile/test/test_gitlab_members.py,sha256=dP_dm-1THba9Vyzcq-EX1tdmBoX2hq8R-MY4Uqknq5s,9896
 reconcile/test/test_instrumented_wrappers.py,sha256=CZzhnQH0c4i7-Rxjg7-0dfFMvVPegLHL46z5NHOOCwo,608
-reconcile/test/test_integrations_manager.py,sha256=gk58nAf-hItITWTAsDye5gWwcJxRg89uihdu0WoHPYg,30628
+reconcile/test/test_integrations_manager.py,sha256=0rd7eAsWFMgLgpl6f7JcoztStlSNhUm728KUk_ttRYo,31644
 reconcile/test/test_jenkins_worker_fleets.py,sha256=kWHvxb0md0feglSjDHZ68acUx44s6H3qw5ZLB5llwsU,2399
 reconcile/test/test_jump_host.py,sha256=ZrsdafquKYXFyGSZFH86aVtF-BsLnYdW1FGH3l5QrBg,3285
 reconcile/test/test_ldap_users.py,sha256=8jjzVgoiRRylGad6-TvkugoFGXt3eko--zVVKjmZDn4,3812
@@ -368,8 +368,7 @@ reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=SkHsWj8FZjOkigUky3Ig
 reconcile/test/test_ocm_machine_pools.py,sha256=o1AE0KzYAEqnsJsyxC7Ox96a_TbqXAK-dQAtBieY4us,23652
 reconcile/test/test_ocm_update_recommended_version.py,sha256=ONY3slwUHwEdonvIYRI2Z8nWPDMTSSLGZ2I1dqaz7fg,4328
 reconcile/test/test_ocm_upgrade_scheduler_org_updater.py,sha256=zYRGUX7pAmxSv9oFYw2ZnPGa-YAPgDfmqXOJM4eE-8A,4353
-reconcile/test/test_openshift_base.py,sha256=ybHiHMPjKdivI-vVf_2os8OP6J-k0c4hvgn6C_HWRjU,26731
-reconcile/test/test_openshift_groups.py,sha256=-OykzdgwhHCo3Cfi_7oSWVg32VGP05orhkYl6QuERog,348
+reconcile/test/test_openshift_base.py,sha256=owJsyyatl_7z6igUEDeJcMMV5_jIwcV2Yj7YgsmYkXs,27035
 reconcile/test/test_openshift_namespace_labels.py,sha256=P1hqi6P88NijNrurdXG_QR2usyo3EYZSy9zpwYHvDsM,12104
 reconcile/test/test_openshift_namespaces.py,sha256=HmRnCE5EnFt3MYceVEFHmk8wWRtCrxu2AFGFkY9pdyA,9214
 reconcile/test/test_openshift_resource.py,sha256=FwU5xzrGyc1FHOL-HA3EH09iktCsdPaGv8HyKNwKit4,13037
@@ -482,7 +481,7 @@ reconcile/utils/environ.py,sha256=u3h1FlnIcZnaAk1POVaSYW_HIvcQG-W-n2DhfSCqwuE,53
 reconcile/utils/exceptions.py,sha256=DwfnWUpVOotpP79RWZ2pycmG6nKCL00RBIeZLYkQPW4,635
 reconcile/utils/expiration.py,sha256=BXwKE50sNIV-Lszke97fxitNkLxYszoOLW1LBgp_yqg,1246
 reconcile/utils/external_resource_spec.py,sha256=OGPKH3IKXgJszRTgE5U_QKgU-s4BHQnx97Lj-Krz46k,6655
-reconcile/utils/external_resources.py,sha256=ik6NOEP_6Tg1fjOpUXVQWW_ybwmR2ieAwO4AotMoqtg,7425
+reconcile/utils/external_resources.py,sha256=eF9Wup8zbLWx56WoA0FlqguT6BRXRYgoyN3cbmpT_Dk,7443
 reconcile/utils/filtering.py,sha256=dw7Ok7HXjZb0ruvCWHFh194rtunX1COLDTRnNfOpwQU,418
 reconcile/utils/git.py,sha256=kgjN93MMB5mnkuNb1n53f5kldGGf5u0pBHj9YJbiE_c,1455
 reconcile/utils/git_secrets.py,sha256=897nRs7tycA3m7YYeVEbzOhI8RFrI9IJT2E0di1eJhc,1956
@@ -608,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.1rc365.dist-info/METADATA,sha256=7qwDtNgwdcPELpxl9DuyjgTjjKbFcObGv44ohiZcYH4,2347
-qontract_reconcile-0.10.1rc365.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc365.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc365.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc365.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc367.dist-info/METADATA,sha256=DyOymmfQbHA1ytfv6km0FdkN6A7RorL33eS7pVKHGH8,2347
+qontract_reconcile-0.10.1rc367.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+qontract_reconcile-0.10.1rc367.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
+qontract_reconcile-0.10.1rc367.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc367.dist-info/RECORD,,

reconcile/closedbox_endpoint_monitoring_base.py

@@ -162,6 +162,7 @@ def run_for_provider(
             probe = probe_builder(ep_mon_provider, endpoints)
             if probe:
                 fill_desired_state(ep_mon_provider, probe, ri)
+        ob.publish_metrics(ri, integration)
         ob.realize_data(dry_run, oc_map, ri, thread_pool_size, recycle_pods=False)
 
         if ri.has_error_registered():

reconcile/gabi_authorized_users.py

@@ -127,6 +127,7 @@ def run(
     if defer:
         defer(oc_map.cleanup)
     fetch_desired_state(gabi_instances, ri)
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 
     if ri.has_error_registered():

reconcile/glitchtip_project_dsn/integration.py

@@ -232,6 +232,7 @@ def run(
             glitchtip_client=glitchtip_client,
         )
 
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     # create/update/delete all secrets
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 

reconcile/integrations_manager.py

@@ -56,6 +56,8 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 IMAGE_DEFAULT = "quay.io/app-sre/qontract-reconcile"
 UPSTREAM_DEFAULT = "https://github.com/app-sre/qontract-reconcile"
 
+INTEGRATION_UPSTREAM_REPOS_PARAM = "INTEGRATION_UPSTREAM_REPOS"
+
 
 def get_image_tag_from_ref(ref: str, upstream: str) -> str:
     gh_prefix = "https://github.com/"
@@ -87,6 +89,17 @@ def collect_parameters(
             if p["name"] in os.environ
         }
         parameters.update(tp_env_vars)
+
+    # overwrite image and imtage tag from environment parameter
+    for upstream_config in (environment.parameters or {}).get(
+        INTEGRATION_UPSTREAM_REPOS_PARAM, []
+    ):
+        if upstream_config.get("repo") == upstream:
+            parameters["IMAGE_TAG"] = get_image_tag_from_ref(
+                upstream_config.get("ref"), upstream
+            )
+
+    # overwrite image tag from cli parameters
     if image_tag_from_ref:
         for e, r in image_tag_from_ref.items():
             if environment.name == e:
@@ -288,6 +301,7 @@ def run(
         integration_environments, ri, upstream, image, image_tag_from_ref
     )
 
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     if use_upstream:
         ob.realize_data(dry_run, oc_map, ri, thread_pool_size, caller=upstream)
     else:

reconcile/openshift_base.py

@@ -1,5 +1,6 @@
 import itertools
 import logging
+from collections import Counter
 from collections.abc import (
     Iterable,
     Mapping,
@@ -1524,7 +1525,7 @@ def publish_metrics(ri: ResourceInventory, integration: str) -> None:
         for state in ("current", "desired"):
             metrics.set_gauge(
                 OpenshiftResourceInventoryGauge(
-                    integration=integration,
+                    integration=integration.replace("_", "-"),
                     cluster=cluster,
                     namespace=namespace,
                     kind=kind,
@@ -1532,3 +1533,23 @@ def publish_metrics(ri: ResourceInventory, integration: str) -> None:
                 ),
                 len(data[state]),
             )
+
+
+def get_state_count_combinations(state: Iterable[Mapping[str, str]]) -> Counter[str]:
+    return Counter(s["cluster"] for s in state)
+
+
+def publish_cluster_desired_metrics_from_state(
+    state: Iterable[Mapping[str, str]], integration: str, kind: str
+) -> None:
+    for cluster, count in get_state_count_combinations(state).items():
+        metrics.set_gauge(
+            OpenshiftResourceInventoryGauge(
+                integration=integration,
+                cluster=cluster,
+                namespace="cluster",
+                kind=kind,
+                state="desired",
+            ),
+            count,
+        )

reconcile/openshift_groups.py

@@ -1,6 +1,5 @@
 import itertools
 import logging
-from collections import Counter
 from collections.abc import (
     Callable,
     Iterable,
@@ -28,7 +27,6 @@ from reconcile.typed_queries.clusters import get_clusters
 from reconcile.utils import (
     expiration,
     gql,
-    metrics,
 )
 from reconcile.utils.defer import defer
 from reconcile.utils.oc_map import (
@@ -36,7 +34,6 @@ from reconcile.utils.oc_map import (
     OCMap,
     init_oc_map_from_clusters,
 )
-from reconcile.utils.openshift_resource import OpenshiftResourceInventoryGauge
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.sharding import is_in_shard
 
@@ -88,7 +85,7 @@ def create_groups_list(
 
 def fetch_current_state(
     thread_pool_size: int, internal: Optional[bool], use_jump_host: bool
-) -> tuple[OCMap, list[dict[str, str]], list[str]]:
+) -> tuple[OCMap, list[dict[str, str]], list[str], list[dict[str, str]]]:
     clusters = [c for c in get_clusters() if is_in_shard(c.name)]
     ocm_clusters = [c.name for c in clusters if c.ocm is not None]
     vault_settings = get_app_interface_vault_settings()
@@ -109,7 +106,7 @@ def fetch_current_state(
     )
 
     current_state = list(itertools.chain.from_iterable(results))
-    return oc_map, current_state, ocm_clusters
+    return oc_map, current_state, ocm_clusters, groups_list
 
 
 def fetch_desired_state(
@@ -267,28 +264,6 @@ def act(diff: Mapping[str, Optional[str]], oc_map: ClusterMap) -> None:
         raise Exception("invalid action: {}".format(action))
 
 
-def get_state_count_combinations(state: Iterable[Mapping[str, str]]) -> Counter[str]:
-    return Counter(s["cluster"] for s in state)
-
-
-def publish_metrics(
-    current_state: Iterable[Mapping[str, str]],
-    desired_state: Iterable[Mapping[str, str]],
-) -> None:
-    for state, state_type in ((current_state, "current"), (desired_state, "desired")):
-        for cluster, count in get_state_count_combinations(state).items():
-            metrics.set_gauge(
-                OpenshiftResourceInventoryGauge(
-                    integration=QONTRACT_INTEGRATION,
-                    cluster=cluster,
-                    namespace="cluster",
-                    kind="GroupBinding",
-                    state=state_type,
-                ),
-                count,
-            )
-
-
 @defer
 def run(
     dry_run: bool,
@@ -297,7 +272,7 @@ def run(
     use_jump_host: bool = True,
     defer: Optional[Callable] = None,
 ) -> None:
-    oc_map, current_state, ocm_clusters = fetch_current_state(
+    oc_map, current_state, ocm_clusters, groups_list = fetch_current_state(
         thread_pool_size, internal, use_jump_host
     )
     if defer:
@@ -316,7 +291,9 @@ def run(
         if not (s["cluster"] in ocm_clusters and s["group"] == "dedicated-admins")
     ]
 
-    publish_metrics(current_state, desired_state)
+    ob.publish_cluster_desired_metrics_from_state(
+        groups_list, QONTRACT_INTEGRATION, "Group"
+    )
     diffs = calculate_diff(current_state, desired_state)
     validate_diffs(diffs)
     diffs.sort(key=sort_diffs)

reconcile/openshift_limitranges.py

@@ -113,6 +113,7 @@ def run(
     defer(oc_map.cleanup)
 
     add_desired_state(namespaces, ri, oc_map)
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size, take_over=take_over)
 
     if ri.has_error_registered():

reconcile/openshift_namespaces.py

@@ -13,6 +13,7 @@ from typing import (
 
 from sretoolbox.utils import threaded
 
+import reconcile.openshift_base as ob
 from reconcile.gql_definitions.common.namespaces_minimal import NamespaceV1
 from reconcile.status import ExitCodes
 from reconcile.typed_queries.app_interface_vault_settings import (
@@ -176,6 +177,10 @@ def run(
     if defer:
         defer(oc_map.cleanup)
 
+    ob.publish_cluster_desired_metrics_from_state(
+        desired_state, QONTRACT_INTEGRATION, "Namespace"
+    )
+
     results = threaded.run(
         manage_namespaces,
         desired_state,

reconcile/openshift_network_policies.py

@@ -142,6 +142,7 @@ def run(dry_run, thread_pool_size=10, internal=None, use_jump_host=True, defer=N
     )
     defer(oc_map.cleanup)
     fetch_desired_state(namespaces, ri, oc_map)
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 
     if ri.has_error_registered():

reconcile/openshift_resourcequotas.py

@@ -76,6 +76,7 @@ def run(
     )
     defer(oc_map.cleanup)
     fetch_desired_state(namespaces, ri, oc_map)
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 
     if ri.has_error_registered():

reconcile/openshift_serviceaccount_tokens.py

@@ -163,6 +163,7 @@ def run(
     )
     defer(oc_map.cleanup)
     fetch_desired_state(namespaces, ri, oc_map)
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
     if not dry_run and vault_output_path:
         write_outputs_to_vault(vault_output_path, ri)

reconcile/openshift_tekton_resources.py

@@ -459,6 +459,8 @@ def run(
     for desired_resource in desired_resources:
         ri.add_desired(**desired_resource)
 
+    LOG.debug("Publishing metrics")
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     LOG.debug("Realizing data")
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 

reconcile/skupper_network/reconciler.py

@@ -251,6 +251,7 @@ def reconcile(
 ) -> None:
     """Realize all skupper resources and create skupper site connections."""
 
+    ob.publish_metrics(ri, integration)
     # create/update/delete all skupper site resources
     ob.realize_data(dry_run, oc_map, ri, thread_pool_size)
 

reconcile/terraform_cloudflare_resources.py

@@ -363,9 +363,7 @@ def run(
 
     cf_clients.populate_resources()
 
-    publish_metrics(
-        cf_clients.resource_spec_inventory, QONTRACT_INTEGRATION.replace("_", "-")
-    )
+    publish_metrics(cf_clients.resource_spec_inventory, QONTRACT_INTEGRATION)
 
     ri, oc_map = _build_oc_resources(
         cloudflare_namespaces,

reconcile/terraform_resources.py

@@ -400,7 +400,7 @@ def run(
         account_names,
         exclude_accounts,
     )
-    publish_metrics(resource_specs, QONTRACT_INTEGRATION.replace("_", "-"))
+    publish_metrics(resource_specs, QONTRACT_INTEGRATION)
 
     if not dry_run and oc_map and defer:
         defer(oc_map.cleanup)
@@ -442,6 +442,7 @@ def run(
     # populate the resource inventory with latest output data
     populate_desired_state(ri, resource_specs)
 
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     actions = []
     if oc_map:
         actions = ob.realize_data(

reconcile/test/test_integrations_manager.py

@@ -1,4 +1,5 @@
 import copy
+import json
 import os
 from collections.abc import (
     Callable,
@@ -30,7 +31,10 @@ from reconcile.gql_definitions.terraform_cloudflare_dns.terraform_cloudflare_zon
     CloudflareDnsRecordV1,
     CloudflareDnsZoneV1,
 )
-from reconcile.integrations_manager import HelmIntegrationSpec
+from reconcile.integrations_manager import (
+    INTEGRATION_UPSTREAM_REPOS_PARAM,
+    HelmIntegrationSpec,
+)
 from reconcile.utils.openshift_resource import ResourceInventory
 from reconcile.utils.runtime.meta import IntegrationMeta
 from reconcile.utils.runtime.sharding import (
@@ -130,6 +134,38 @@ def test_collect_parameters_image_tag_from_ref(mocker):
     assert parameters == expected
 
 
+def test_collect_parameters_namespace_environment_parameter(mocker):
+    upstream = "https://github.com/some-upstream-repo"
+    template = {
+        "parameters": [
+            {
+                "name": "IMAGE_TAG",
+                "value": "dummy",
+            }
+        ]
+    }
+    os.environ["IMAGE_TAG"] = "env override"
+    environment = EnvironmentV1(
+        name="env",
+        parameters=json.dumps(
+            {
+                "IMAGE_TAG": "env-file-general-override",
+                INTEGRATION_UPSTREAM_REPOS_PARAM: [
+                    {
+                        "repo": upstream,
+                        "ref": "master",
+                    }
+                ],
+            }
+        ),
+    )
+    mocker.patch(
+        "reconcile.integrations_manager.get_image_tag_from_ref", return_value="f44e417"
+    )
+    parameters = intop.collect_parameters(template, environment, upstream, "", None)
+    assert parameters["IMAGE_TAG"] == "f44e417"
+
+
 @pytest.fixture
 def resources() -> dict[str, Any]:
     return {

reconcile/test/test_openshift_base.py

@@ -992,3 +992,15 @@ def test_realize_resource_data_3way_diff(
     assert len(actions) == len_actions
     assert apply_mock.call_count == apply_calls
     assert delete_mock.call_count == delete_calls
+
+
+def test_get_state_count_combinations():
+    state = [
+        {"cluster": "c1"},
+        {"cluster": "c2"},
+        {"cluster": "c1"},
+        {"cluster": "c3"},
+        {"cluster": "c2"},
+    ]
+    expected = {"c1": 2, "c2": 2, "c3": 1}
+    assert expected == sut.get_state_count_combinations(state)

reconcile/utils/external_resources.py

@@ -83,7 +83,7 @@ def publish_metrics(inventory: ExternalResourceSpecInventory, integration: str)
         provision_provider, provisioner_name, provider = combination
         metrics.set_gauge(
             ExternalResourceInventoryGauge(
-                integration=integration,
+                integration=integration.replace("_", "-"),
                 provision_provider=provision_provider,
                 provisioner_name=provisioner_name,
                 provider=provider,

reconcile/test/test_openshift_groups.py

@@ -1,13 +0,0 @@
-from reconcile import openshift_groups as og
-
-
-def test_get_state_count_combinations():
-    state = [
-        {"cluster": "c1"},
-        {"cluster": "c2"},
-        {"cluster": "c1"},
-        {"cluster": "c3"},
-        {"cluster": "c2"},
-    ]
-    expected = {"c1": 2, "c2": 2, "c3": 1}
-    assert expected == og.get_state_count_combinations(state)