qontract-reconcile 0.10.1rc989__py3-none-any.whl → 0.10.1rc990__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.1
2
2
  Name: qontract-reconcile
3
- Version: 0.10.1rc989
3
+ Version: 0.10.1rc990
4
4
  Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
5
5
  Home-page: https://github.com/app-sre/qontract-reconcile
6
6
  Author: Red Hat App-SRE Team
@@ -799,7 +799,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
799
799
  reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
800
800
  reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
801
801
  reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
802
- reconcile/utils/saasherder/saasherder.py,sha256=yi9xG_QElJlJgQlr3ADLHNwaptZVYA3SzYdVxXPXq4s,84489
802
+ reconcile/utils/saasherder/saasherder.py,sha256=sC48LMtbKW2Mhyql2VwTMEYHugCXI9imdz8yeYlq0dk,84729
803
803
  reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
804
804
  reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
805
805
  reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -850,8 +850,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
850
850
  tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
851
851
  tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
852
852
  tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
853
- qontract_reconcile-0.10.1rc989.dist-info/METADATA,sha256=t6u-8a7LRyLMJ6e6ODemRnC5wQz7WwdkOi-ntwKUKwQ,2262
854
- qontract_reconcile-0.10.1rc989.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
855
- qontract_reconcile-0.10.1rc989.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
856
- qontract_reconcile-0.10.1rc989.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
857
- qontract_reconcile-0.10.1rc989.dist-info/RECORD,,
853
+ qontract_reconcile-0.10.1rc990.dist-info/METADATA,sha256=gPHQgGX8QfVXyoDNJ5Lx-SBWvxs9-idwSy5huEDo0GE,2262
854
+ qontract_reconcile-0.10.1rc990.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
855
+ qontract_reconcile-0.10.1rc990.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
856
+ qontract_reconcile-0.10.1rc990.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
857
+ qontract_reconcile-0.10.1rc990.dist-info/RECORD,,
@@ -969,11 +969,16 @@ class SaasHerder: # pylint: disable=too-many-public-methods
969
969
  else True
970
970
  )
971
971
  consolidated_parameters = spec.parameters(adjust=False)
972
- image = consolidated_parameters.get("image", {})
973
- if isinstance(image, dict) and not image.get("tag"):
974
- commit_sha = self._get_commit_sha(url, ref, github)
975
- image_tag = commit_sha[:hash_length]
976
- consolidated_parameters.setdefault("image", {})["tag"] = image_tag
972
+ commit_sha = self._get_commit_sha(url, ref, github)
973
+ image_tag = commit_sha[:hash_length]
974
+ image = consolidated_parameters.setdefault("image", {})
975
+ if isinstance(image, dict):
976
+ image.setdefault("tag", image_tag)
977
+ global_parameters = consolidated_parameters.setdefault("global", {})
978
+ if isinstance(global_parameters, dict):
979
+ image = global_parameters.setdefault("image", {})
980
+ if isinstance(image, dict):
981
+ image.setdefault("tag", image_tag)
977
982
  resources = helm.template_all(
978
983
  url=url,
979
984
  path=path,