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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: qontract-reconcile
3
- Version: 0.10.2.dev150
3
+ Version: 0.10.2.dev153
4
4
  Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
5
5
  Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
6
6
  Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -77,14 +77,14 @@ reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_R
77
77
  reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
78
78
  reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
79
79
  reconcile/openshift_saas_deploy_change_tester.py,sha256=12uyBwaeMka1C3_pejmQPIBPAx2V1sJ4dJkScq-2e2M,8793
80
- reconcile/openshift_saas_deploy_trigger_base.py,sha256=Ss_FE31d8jR2f3lbSiU0ROBMVI1kg-Y_8nxLavFPFko,14036
80
+ reconcile/openshift_saas_deploy_trigger_base.py,sha256=3ypo4RNmJmrGfiyS-2OcoyITVi10LWch6JITikejlBM,14204
81
81
  reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=roLyVAVntaQptKaZbnN1LyLvCA8fyvqELfjU6M8xfeY,3511
82
82
  reconcile/openshift_saas_deploy_trigger_configs.py,sha256=eUejMGWuaQabZTLuvPLLvROfN5HOFyYZOpH4YEsiU_g,928
83
83
  reconcile/openshift_saas_deploy_trigger_images.py,sha256=iUsiBGJf-CyFw7tSLWo59rXmSvsVnN6TTaAObbsVpNg,936
84
84
  reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=fpanSH-EGH15C9me--0VSpcpaw9BY4RTb8_mPtsSZGc,942
85
85
  reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=0CjfeVQE0QrRrOVuTxkXvBUdKNtYLYuX4mZRB48PQ9g,940
86
86
  reconcile/openshift_serviceaccount_tokens.py,sha256=SaYT8g_T1W8P8r391ZWV1rYv5BfFxy8x_HIM9XqAm3g,8906
87
- reconcile/openshift_tekton_resources.py,sha256=wUq7ituxqwpVEXHPKYQ9Q-wYZZR0fLgJioQfJFEdEZY,16205
87
+ reconcile/openshift_tekton_resources.py,sha256=ZAhPhj5dXxOF2XdNTeksAX-oa2gVCIbL45Gep05nG90,16267
88
88
  reconcile/openshift_upgrade_watcher.py,sha256=9IB321hlRZZhzdaR9G3zoWAhVv0-KzNiEqx73p3-wmk,6539
89
89
  reconcile/openshift_users.py,sha256=JUWLb13USlQ4KvXZVsi3JES4csZnXlH0plhxskg_p6A,5300
90
90
  reconcile/openshift_vault_secrets.py,sha256=9rTqV6wzCQx2Oh712E_Xj8wMG7u8Oh-pY8DWjlv4mZw,1660
@@ -94,7 +94,7 @@ reconcile/quay_mirror.py,sha256=0KtQFwrvMNtlsPJ9F_-ICaVIjgIUjFxqipvAPcvyg3Q,1533
94
94
  reconcile/quay_mirror_org.py,sha256=tXKuF6JtmaNRwu8_g_65U_Vpd6sFBYeXmJA-flVhylE,10764
95
95
  reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
96
96
  reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
97
- reconcile/queries.py,sha256=XU5ksCW6f8AmVHsg8WEAxiL4cwzLBkpvsYn9EqZ228Q,50890
97
+ reconcile/queries.py,sha256=JbkF6F13xdToj1WgWzkK7aU1Gf_gFbjuJvdsyQrZ1iw,50905
98
98
  reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
99
99
  reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
100
100
  reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
@@ -657,7 +657,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
657
657
  reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
658
658
  reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
659
659
  reconcile/utils/terraform_client.py,sha256=IDlrNvGEc2i6ElZIL_fzaJEad1nRC3DkP9_VXhJXmU0,37329
660
- reconcile/utils/terrascript_aws_client.py,sha256=WMT9cZ4Cu4vjiIgRiTMyZ3Iio2_HNODg2OlrWGW9nQA,288803
660
+ reconcile/utils/terrascript_aws_client.py,sha256=FH4BFlAhTN9KughGlSUF75XpsquilIe4MGyLz4E9CGc,288893
661
661
  reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
662
662
  reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
663
663
  reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
797
797
  tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
798
798
  tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
799
799
  tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
800
- qontract_reconcile-0.10.2.dev150.dist-info/METADATA,sha256=hnP4JA3UNqYGiaLiKJXkzr8GLPFc1ylIOBeaKyP_aGY,24627
801
- qontract_reconcile-0.10.2.dev150.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
802
- qontract_reconcile-0.10.2.dev150.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
803
- qontract_reconcile-0.10.2.dev150.dist-info/RECORD,,
800
+ qontract_reconcile-0.10.2.dev153.dist-info/METADATA,sha256=ZrltsVvXSSiCsv4o8Yfra_Dxd8OJfIPEO7M6CByNhQo,24627
801
+ qontract_reconcile-0.10.2.dev153.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
802
+ qontract_reconcile-0.10.2.dev153.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
803
+ qontract_reconcile-0.10.2.dev153.dist-info/RECORD,,
@@ -376,7 +376,13 @@ def _construct_tekton_trigger_resource(
376
376
  body: dict[str, Any] = {
377
377
  "apiVersion": "tekton.dev/v1",
378
378
  "kind": "PipelineRun",
379
- "metadata": {"generateName": f"{name}-"},
379
+ "metadata": {
380
+ "generateName": f"{name}-",
381
+ "labels": {
382
+ "qontract.saas_file_name": saas_file_name,
383
+ "qontract.env_name": env_name,
384
+ },
385
+ },
380
386
  "spec": {
381
387
  "pipelineRef": {"name": tkn_pipeline_name},
382
388
  "params": parameters,
@@ -139,6 +139,9 @@ def fetch_desired_resources(
139
139
  while we are migrating from the current system to this integration"""
140
140
  desired_resources = []
141
141
  for tknp in tkn_providers.values():
142
+ if tknp["namespace"]["delete"]:
143
+ continue
144
+
142
145
  namespace = tknp["namespace"]["name"]
143
146
  cluster = tknp["namespace"]["cluster"]["name"]
144
147
  deploy_resources = tknp.get("deployResources") or DEFAULT_DEPLOY_RESOURCES
reconcile/queries.py CHANGED
@@ -2068,6 +2068,7 @@ PIPELINES_PROVIDERS_QUERY = """
2068
2068
  }
2069
2069
  namespace {
2070
2070
  name
2071
+ delete
2071
2072
  cluster {
2072
2073
  name
2073
2074
  serverUrl
@@ -4639,11 +4639,14 @@ class TerrascriptClient: # pylint: disable=too-many-public-methods
4639
4639
  admin_user_secret = auth_options["admin_user_credentials"]
4640
4640
  secret_data = self.secret_reader.read_all(admin_user_secret)
4641
4641
 
4642
- required_keys = {"master_user_name", "master_user_password"}
4643
- if secret_data.keys() != required_keys:
4642
+ required_keys = {
4643
+ "master_user_name",
4644
+ "master_user_password",
4645
+ }
4646
+ if not (required_keys <= secret_data.keys()):
4644
4647
  raise KeyError(
4645
4648
  f"vault secret '{admin_user_secret['path']}' must "
4646
- f"exactly contain these keys: {', '.join(required_keys)}"
4649
+ f"contain these keys: {', '.join(required_keys)}"
4647
4650
  )
4648
4651
 
4649
4652
  # 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
5005
5008
  master_user_secret = master_user_options["master_user_secret"]
5006
5009
  secret_data = self.secret_reader.read_all(master_user_secret)
5007
5010
 
5008
- required_keys = {"master_user_name", "master_user_password"}
5009
- if secret_data.keys() != required_keys:
5011
+ required_keys = {
5012
+ "master_user_name",
5013
+ "master_user_password",
5014
+ }
5015
+ if not (required_keys <= secret_data.keys()):
5010
5016
  raise KeyError(
5011
5017
  f"vault secret '{master_user_secret['path']}' must "
5012
- f"exactly contain these keys: {', '.join(required_keys)}"
5018
+ f"contain these keys: {', '.join(required_keys)}"
5013
5019
  )
5014
5020
 
5015
5021
  advanced_security_options["master_user_options"] = secret_data