qontract-reconcile 0.10.1rc1106__py3-none-any.whl → 0.10.1rc1108__py3-none-any.whl

{qontract_reconcile-0.10.1rc1106.dist-info → qontract_reconcile-0.10.1rc1108.dist-info}/METADATA

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

@@ -292,7 +292,7 @@ reconcile/gql_definitions/endpoints_discovery/namespaces.py,sha256=FqJ0H7NdsIm5B
 reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/aws_accounts.py,sha256=XR69j9dpTQ0gv8y-AZN7AJ0dPvO-wbHscyCDgrax6Bk,2046
 reconcile/gql_definitions/external_resources/external_resources_modules.py,sha256=HFOQjmNbNxk0j5nChxppQeCnJjeDsqibJkPgA7R1zRw,2417
-reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=5aQaNJC73cT-EqiDZ8rq5zaxUAX5dcbyuRp-YEBADwI,42533
+reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=-ehru0zFyTGOmhh3YB1nHVBd480Iq3rlOnPM3PEA20A,42585
 reconcile/gql_definitions/external_resources/external_resources_settings.py,sha256=Hw9n_90BPG6Lnt2PT3mHc6p0KEm2CxKxvSGRFc_Dhus,2982
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/fragments/aus_organization.py,sha256=uBKbTuBa3CZmTXR5HOcGhRcu2U9kM93KbYmoWTxcpB0,4767
@@ -683,7 +683,7 @@ reconcile/utils/gitlab_api.py,sha256=C1nsHQKKybsmFdaG9vsItBjJm69ym4VWbqbKfAEf7oY
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
-reconcile/utils/helm.py,sha256=Zmh9shdcUNJmiHIbBDkuUlk9T_Cg7uvWfw9c4St2n8E,3775
+reconcile/utils/helm.py,sha256=cbvmmdjtfPfHhD5SPqf922P6IKO4Ll9FYiCAIRfQtTk,3830
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -819,7 +819,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=6JE3WfpJKuAN1fdRKJb04L4zMfFHq5vdEwxLWt6yn64,85894
+reconcile/utils/saasherder/saasherder.py,sha256=ncFN9ERyTPHxBlOi55FMRakrbN1OfjI2UfbR1YM1IjE,85903
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -870,8 +870,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1106.dist-info/METADATA,sha256=9PaXH91G3Ab2O31mwqiRbOyczL6oS7GhRP7SUadkKW8,2213
-qontract_reconcile-0.10.1rc1106.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1106.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1106.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1106.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1108.dist-info/METADATA,sha256=az7lDLiH7BhZnyTw8M9meiq92C4PfaaPpIwv4u93eMw,2213
+qontract_reconcile-0.10.1rc1108.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1108.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1108.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1108.dist-info/RECORD,,

reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -483,6 +483,7 @@ query ExternalResourcesNamespaces {
       name
     }
     app {
+      path
       name
     }
     cluster {
@@ -1021,6 +1022,7 @@ class EnvironmentV1(ConfiguredBaseModel):
 
 
 class AppV1(ConfiguredBaseModel):
+    path: str = Field(..., alias="path")
     name: str = Field(..., alias="name")
 
 

reconcile/utils/helm.py

@@ -28,7 +28,7 @@ class JSONEncoder(json.JSONEncoder):
 def do_template(
     values: Mapping[str, Any],
     path: str,
-    name: str,
+    namespace: str,
 ) -> str:
     try:
         with (
@@ -76,9 +76,9 @@ def do_template(
                     "helm",
                     "template",
                     path,
-                    "-n",
-                    name,
-                    "-f",
+                    "--namespace",
+                    namespace,
+                    "--values",
                     values_file.name,
                     "--repository-config",
                     repository_config_file.name,
@@ -100,20 +100,20 @@ def do_template(
 def template(
     values: Mapping[str, Any],
     path: str = "./helm/qontract-reconcile",
-    name: str = "qontract-reconcile",
+    namespace: str = "qontract-reconcile",
 ) -> Mapping[str, Any]:
-    return yaml.safe_load(do_template(values=values, path=path, name=name))
+    return yaml.safe_load(do_template(values=values, path=path, namespace=namespace))
 
 
 def template_all(
     url: str,
     path: str,
-    name: str,
+    namespace: str,
     values: Mapping[str, Any],
     ssl_verify: bool = True,
 ) -> Iterable[Mapping[str, Any]]:
     with tempfile.TemporaryDirectory() as wd:
         git.clone(url, wd, depth=1, verify=ssl_verify)
         return yaml.safe_load_all(
-            do_template(values=values, path=f"{wd}{path}", name=name)
+            do_template(values=values, path=f"{wd}{path}", namespace=namespace)
         )

reconcile/utils/saasherder/saasherder.py

@@ -989,7 +989,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             resources = helm.template_all(
                 url=url,
                 path=path,
-                name=resource_template_name,
+                namespace=spec.target.namespace.name,
                 values=consolidated_parameters,
                 ssl_verify=ssl_verify,
             )