qontract-reconcile 0.10.2.dev150__py3-none-any.whl → 0.10.2.dev153__py3-none-any.whl

{qontract_reconcile-0.10.2.dev150.dist-info → qontract_reconcile-0.10.2.dev153.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev150
+Version: 0.10.2.dev153
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev150.dist-info → qontract_reconcile-0.10.2.dev153.dist-info}/RECORD

@@ -77,14 +77,14 @@ reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_R
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
 reconcile/openshift_saas_deploy_change_tester.py,sha256=12uyBwaeMka1C3_pejmQPIBPAx2V1sJ4dJkScq-2e2M,8793
-reconcile/openshift_saas_deploy_trigger_base.py,sha256=Ss_FE31d8jR2f3lbSiU0ROBMVI1kg-Y_8nxLavFPFko,14036
+reconcile/openshift_saas_deploy_trigger_base.py,sha256=3ypo4RNmJmrGfiyS-2OcoyITVi10LWch6JITikejlBM,14204
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=roLyVAVntaQptKaZbnN1LyLvCA8fyvqELfjU6M8xfeY,3511
 reconcile/openshift_saas_deploy_trigger_configs.py,sha256=eUejMGWuaQabZTLuvPLLvROfN5HOFyYZOpH4YEsiU_g,928
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=iUsiBGJf-CyFw7tSLWo59rXmSvsVnN6TTaAObbsVpNg,936
 reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=fpanSH-EGH15C9me--0VSpcpaw9BY4RTb8_mPtsSZGc,942
 reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=0CjfeVQE0QrRrOVuTxkXvBUdKNtYLYuX4mZRB48PQ9g,940
 reconcile/openshift_serviceaccount_tokens.py,sha256=SaYT8g_T1W8P8r391ZWV1rYv5BfFxy8x_HIM9XqAm3g,8906
-reconcile/openshift_tekton_resources.py,sha256=wUq7ituxqwpVEXHPKYQ9Q-wYZZR0fLgJioQfJFEdEZY,16205
+reconcile/openshift_tekton_resources.py,sha256=ZAhPhj5dXxOF2XdNTeksAX-oa2gVCIbL45Gep05nG90,16267
 reconcile/openshift_upgrade_watcher.py,sha256=9IB321hlRZZhzdaR9G3zoWAhVv0-KzNiEqx73p3-wmk,6539
 reconcile/openshift_users.py,sha256=JUWLb13USlQ4KvXZVsi3JES4csZnXlH0plhxskg_p6A,5300
 reconcile/openshift_vault_secrets.py,sha256=9rTqV6wzCQx2Oh712E_Xj8wMG7u8Oh-pY8DWjlv4mZw,1660
@@ -94,7 +94,7 @@ reconcile/quay_mirror.py,sha256=0KtQFwrvMNtlsPJ9F_-ICaVIjgIUjFxqipvAPcvyg3Q,1533
 reconcile/quay_mirror_org.py,sha256=tXKuF6JtmaNRwu8_g_65U_Vpd6sFBYeXmJA-flVhylE,10764
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=XU5ksCW6f8AmVHsg8WEAxiL4cwzLBkpvsYn9EqZ228Q,50890
+reconcile/queries.py,sha256=JbkF6F13xdToj1WgWzkK7aU1Gf_gFbjuJvdsyQrZ1iw,50905
 reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
@@ -657,7 +657,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
-reconcile/utils/terrascript_aws_client.py,sha256=WMT9cZ4Cu4vjiIgRiTMyZ3Iio2_HNODg2OlrWGW9nQA,288803
+reconcile/utils/terrascript_aws_client.py,sha256=FH4BFlAhTN9KughGlSUF75XpsquilIe4MGyLz4E9CGc,288893
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev150.dist-info/METADATA,sha256=hnP4JA3UNqYGiaLiKJXkzr8GLPFc1ylIOBeaKyP_aGY,24627
-qontract_reconcile-0.10.2.dev150.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev150.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev150.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev153.dist-info/METADATA,sha256=ZrltsVvXSSiCsv4o8Yfra_Dxd8OJfIPEO7M6CByNhQo,24627
+qontract_reconcile-0.10.2.dev153.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev153.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev153.dist-info/RECORD,,

reconcile/openshift_saas_deploy_trigger_base.py

@@ -376,7 +376,13 @@ def _construct_tekton_trigger_resource(
     body: dict[str, Any] = {
         "apiVersion": "tekton.dev/v1",
         "kind": "PipelineRun",
-        "metadata": {"generateName": f"{name}-"},
+        "metadata": {
+            "generateName": f"{name}-",
+            "labels": {
+                "qontract.saas_file_name": saas_file_name,
+                "qontract.env_name": env_name,
+            },
+        },
         "spec": {
             "pipelineRef": {"name": tkn_pipeline_name},
             "params": parameters,

reconcile/openshift_tekton_resources.py

@@ -139,6 +139,9 @@ def fetch_desired_resources(
     while we are migrating from the current system to this integration"""
     desired_resources = []
     for tknp in tkn_providers.values():
+        if tknp["namespace"]["delete"]:
+            continue
+
         namespace = tknp["namespace"]["name"]
         cluster = tknp["namespace"]["cluster"]["name"]
         deploy_resources = tknp.get("deployResources") or DEFAULT_DEPLOY_RESOURCES

reconcile/queries.py

@@ -2068,6 +2068,7 @@ PIPELINES_PROVIDERS_QUERY = """
       }
       namespace {
         name
+        delete
         cluster {
           name
           serverUrl

reconcile/utils/terrascript_aws_client.py

@@ -4639,11 +4639,14 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             admin_user_secret = auth_options["admin_user_credentials"]
             secret_data = self.secret_reader.read_all(admin_user_secret)
 
-            required_keys = {"master_user_name", "master_user_password"}
-            if secret_data.keys() != required_keys:
+            required_keys = {
+                "master_user_name",
+                "master_user_password",
+            }
+            if not (required_keys <= secret_data.keys()):
                 raise KeyError(
                     f"vault secret '{admin_user_secret['path']}' must "
-                    f"exactly contain these keys: {', '.join(required_keys)}"
+                    f"contain these keys: {', '.join(required_keys)}"
                 )
 
             # AWS requires the admin user password must be at least 8 chars long, contain at least one
@@ -5005,11 +5008,14 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             master_user_secret = master_user_options["master_user_secret"]
             secret_data = self.secret_reader.read_all(master_user_secret)
 
-            required_keys = {"master_user_name", "master_user_password"}
-            if secret_data.keys() != required_keys:
+            required_keys = {
+                "master_user_name",
+                "master_user_password",
+            }
+            if not (required_keys <= secret_data.keys()):
                 raise KeyError(
                     f"vault secret '{master_user_secret['path']}' must "
-                    f"exactly contain these keys: {', '.join(required_keys)}"
+                    f"contain these keys: {', '.join(required_keys)}"
                 )
 
             advanced_security_options["master_user_options"] = secret_data