qontract-reconcile 0.10.2.dev146__py3-none-any.whl → 0.10.2.dev148__py3-none-any.whl

{qontract_reconcile-0.10.2.dev146.dist-info → qontract_reconcile-0.10.2.dev148.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev146
+Version: 0.10.2.dev148
 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.dev146.dist-info → qontract_reconcile-0.10.2.dev148.dist-info}/RECORD

@@ -512,7 +512,7 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
 reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=zqMMlKWV-aUDMtA-Xu5kl5pYLilewDClnKM0c807nNA,2146
 reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=hQ-WapiBNV3oEKQ813W3bD4HwQ4gADRPy80z9OLtW3Y,2317
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/renderer.py,sha256=6qFeXNqAE8t85eewfm8Pcj9i_Fp2UJ1lad_zTqYmF7M,14753
+reconcile/templating/renderer.py,sha256=VA_lMMtsyEFc0Cwf0jehQdv3tMEJtfyZMzBgA5us5ME,14856
 reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/lib/merge_request_manager.py,sha256=XwpOR4rVS9ZiJ_Mn8qfCXPZ7CRLMGSJgeIkqD-8Jhgc,5228
@@ -770,7 +770,7 @@ tools/app_sre_tekton_access_reporter.py,sha256=o9prLUgQpwO3msRWc2as1xT1y9OB3znkp
 tools/app_sre_tekton_access_revalidation.py,sha256=66nHEaY-bIqxIhpcmwN8AvQZu6ZXenfkg4Fut0pVZRM,2726
 tools/glitchtip_access_reporter.py,sha256=o01A6b88t3Wie6tj_tJWWVo2J01LxQ_a9giGm4UzEaU,2901
 tools/glitchtip_access_revalidation.py,sha256=PXN5wxl6OX8sxddPaakDF3X79nFLvpm-lz0mWLVelw0,2806
-tools/qontract_cli.py,sha256=yvPjIMY-WA9beT3uKdrdCdNhBCRJWdpTZnlRQzmoq8M,157447
+tools/qontract_cli.py,sha256=VmwXfvYEUewhvTYA3M2ucjRzhCb2G42AWrb9asMsdSQ,157451
 tools/sd_app_sre_alert_report.py,sha256=jQpJdXVID68bSNtJNOGDh0-ei1CfEUS4Itr4MAaBNFA,5062
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.dev146.dist-info/METADATA,sha256=bofZzVC5xjHk0OzPD8ZWg1IakABpZVUcF1mETGPI_7g,24627
-qontract_reconcile-0.10.2.dev146.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev146.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev146.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev148.dist-info/METADATA,sha256=kBuHS7iU_WbaGxjsnZVvv7rpMhB0hutZQ94Hs7AYogI,24627
+qontract_reconcile-0.10.2.dev148.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev148.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev148.dist-info/RECORD,,

reconcile/templating/renderer.py

@@ -30,8 +30,8 @@ from reconcile.typed_queries.app_interface_repo_url import get_app_interface_rep
 from reconcile.typed_queries.github_orgs import get_github_orgs
 from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
 from reconcile.utils import gql
-from reconcile.utils.git import clone
-from reconcile.utils.gql import GqlApi, init_from_config
+from reconcile.utils.git import checkout, clone
+from reconcile.utils.gql import GqlApi
 from reconcile.utils.jinja2.utils import TemplateRenderOptions, process_jinja2_template
 from reconcile.utils.ruamel import create_ruamel_instance
 from reconcile.utils.runtime.integration import (
@@ -333,7 +333,6 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
     def reconcile(
         self, persistence: FilePersistence, ruamel_instance: yaml.YAML
     ) -> None:
-        gql_api = init_from_config(validate_schemas=False)
         for collection in get_template_collections(
             name=self.params.template_collection_name
         ):
@@ -351,7 +350,7 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                 for item in for_each_items:
                     self.reconcile_template_collection(
                         collection=collection,
-                        gql_api=gql_api,
+                        gql_api=gql.get_api(),
                         persistence=p,
                         ruamel_instance=ruamel_instance,
                         each=item,
@@ -398,6 +397,8 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
             ) as temp_dir:
                 logging.debug(f"Cloning {url} to {temp_dir}")
                 clone(url, temp_dir, depth=1, verify=ssl_verify)
+                logging.debug(f"Checking out commit {gql.get_api().commit}")
+                checkout(str(gql.get_api().commit), temp_dir, verify=bool(ssl_verify))
                 persistence = ClonedRepoGitlabPersistence(
                     dry_run=dry_run,
                     local_path=temp_dir,

tools/qontract_cli.py

@@ -2510,7 +2510,7 @@ def selectorsyncset_managed_resources(ctx: click.Context, use_jump_host: bool) -
             try:
                 for resource in sss["spec"]["resources"]:
                     kind = resource["kind"]
-                    namespace = resource["metadata"].get("namespace")
+                    namespace = resource["metadata"].get("namespace", "")
                     name = resource["metadata"]["name"]
                     item = {
                         "cluster": c_name,