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

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

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

@@ -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=A2-Wn4MGDAG_dqVpqohgmPDvjxIhhRUP3vTzjpUARUE,8934
+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
@@ -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
@@ -607,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.1rc366.dist-info/METADATA,sha256=W9-LNuNK1j6SrHBRASJ5oxJvGgG3gBsjOZzT-xw70pc,2347
-qontract_reconcile-0.10.1rc366.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc366.dist-info/entry_points.txt,sha256=ErVY2Jp-0Rtuq5KOtMlW5yvna4nIEuc_1YbEdEdcy9o,301
-qontract_reconcile-0.10.1rc366.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc366.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/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:

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 {