qontract-reconcile 0.10.1rc556__py3-none-any.whl → 0.10.1rc558__py3-none-any.whl

{qontract_reconcile-0.10.1rc556.dist-info → qontract_reconcile-0.10.1rc558.dist-info}/METADATA

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

@@ -70,10 +70,10 @@ reconcile/openshift_namespaces.py,sha256=DboMc6t0vXD54lL9ZP9P9fQnCRo2g_0z5FWubtW
 reconcile/openshift_network_policies.py,sha256=_qqv7yj17OM1J8KJPsFmzFZ85gzESJeBocC672z4_WU,4231
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=kwsY5cko7udEKNlhL2oKiKv_5wzEw9wmmwROE016ng8,1400
-reconcile/openshift_resources_base.py,sha256=DpB7DD8SqVrlqaZ6Vvv6WdA92DLRUhKNksum82ZZo_8,46630
+reconcile/openshift_resources_base.py,sha256=6dHsqa6UA8SkjiXNRn4JlsBH7hYp6q-OLhhPa2M3bCs,46694
 reconcile/openshift_rolebindings.py,sha256=PjKH_EdkdpFwqTA3ajptdUVrNvT9bBARSJBCcRW07fM,6553
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
-reconcile/openshift_saas_deploy.py,sha256=NFiNrk7055vunzzJmI7cVBubFj6JPDlEpJqDwpG_t9g,12706
+reconcile/openshift_saas_deploy.py,sha256=fmhopPEbyZsGQHRPzyzpKEvoBXEGN3aPxFi7Utq0emU,12788
 reconcile/openshift_saas_deploy_change_tester.py,sha256=fMmPDz-ZRO-WH8OIiDo4e4sBK4-zzpvFXmVCKGY1l-I,8837
 reconcile/openshift_saas_deploy_trigger_base.py,sha256=p1Mv7dbw_K7TVFv-M-DDq6r1ltuW9VAF6PCNnEng_zM,14291
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=aT8wqoXGyZEeXUA7Q6reaL9v5j5UnPLoYVe70D31HUg,2917
@@ -679,8 +679,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=se-YG_YVCWRFrnCPvBVHDBT_59CkbIoEni-4SJa8_MU,2755
 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.1rc556.dist-info/METADATA,sha256=r9LH3hpbhj9Q3WpWo-_u7EMNv20-amtykJvbcp332mk,2349
-qontract_reconcile-0.10.1rc556.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc556.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc556.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc556.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc558.dist-info/METADATA,sha256=zuvGj1oR22yLBw_2XFSDHCFjcnnyXTawqr-DjPlqyLY,2349
+qontract_reconcile-0.10.1rc558.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc558.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc558.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc558.dist-info/RECORD,,

reconcile/openshift_resources_base.py

@@ -1417,12 +1417,14 @@ def early_exit_monkey_patch():
             key,
             version=None,
             tvars=None,
-            settings=None: f"vault({path}, {key}, {version})",
+            settings=None,
+            secret_reader=None: f"vault({path}, {key}, {version})",
             lambda repo,
             path,
             ref,
             tvars=None,
-            settings=None: f"github({repo}, {path}, {ref})",
+            settings=None,
+            secret_reader=None: f"github({repo}, {path}, {ref})",
             lambda url: False,
             lambda data, path, alertmanager_config_key, decode_base64=False: True,
         )

reconcile/openshift_saas_deploy.py

@@ -329,9 +329,11 @@ def run(
             f.write(url + "\n")
             f.write(emails + "\n")
         images = " ".join(saasherder.images)
-        images_file = os.path.join(io_dir, "images")
-        with open(images_file, "w", encoding="locale") as f:
-            f.write(images)
+        app_name = saas_file.app.name
+        clamav_file = os.path.join(io_dir, "clamav")
+        with open(clamav_file, "w", encoding="locale") as f:
+            f.write(images + "\n")
+            f.write(app_name + "\n")
         image_auth = saasherder._initiate_image_auth(saas_file)
         if image_auth.auth_server:
             json_file = os.path.join(io_dir, "dockerconfigjson")