qontract-reconcile 0.10.1rc916__py3-none-any.whl → 0.10.1rc917__py3-none-any.whl

{qontract_reconcile-0.10.1rc916.dist-info → qontract_reconcile-0.10.1rc917.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=W4lRKuz6Z_EHXLf-mQLb3mVdcAr23H4JrY-R8UUPBbs,105862
+reconcile/cli.py,sha256=Cd_Oq-izWc-NJ1jRCPbkhADTrOsYprhVUip-mz2uyp8,106043
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -661,7 +661,7 @@ reconcile/utils/gitlab_api.py,sha256=T4kAaiXRztgxTMpyR0XND_6Wm0WThRoHUNULzNZxNBA
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=IGhxzBcuebbapDKLseevEThSsxa_eDCPNpo3A4VnOS4,14066
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
-reconcile/utils/helm.py,sha256=Rt1ao4yI4GdThZyIPV75JLJjkvu9d8kOLKQht6KUzyE,1325
+reconcile/utils/helm.py,sha256=qnXtw3nyKJqobSG4d6PtvulqToqiEGuXK5PbgfwSFHI,1942
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
 reconcile/utils/imap_client.py,sha256=PMsX8UjJ2F59fXbbqREjLVdapYWznYTB8svFmpt39qA,1949
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
@@ -793,7 +793,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=McvpJhwh-QfrNT76hekvx5U5Xq2Hp1Yt1XHTW2d3Cn8,5466
-reconcile/utils/saasherder/saasherder.py,sha256=pg3eL_Rx8ZgoYSfXYdyftEdYWv5sHi_UgNuihlIaG9o,87701
+reconcile/utils/saasherder/saasherder.py,sha256=ul6sRbgvxUSnrDZXwJQ9nnQumkpTERTLFBWuiIWlCUA,88241
 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=3gUIIIEv52Vx7-VgQ2FZYfCCrfqUv_5gw_TQ3mbLcTs,4666
@@ -844,8 +844,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.1rc916.dist-info/METADATA,sha256=KPsigSS8webUozoUf662AHUkUx8hpkChedhbl1ngNKY,2273
-qontract_reconcile-0.10.1rc916.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc916.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc916.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc916.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc917.dist-info/METADATA,sha256=9i8HABFSIkcnnT-zpqr2yfJeF9T7rzIQVADi3hQzMy4,2273
+qontract_reconcile-0.10.1rc917.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc917.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc917.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc917.dist-info/RECORD,,

reconcile/cli.py

@@ -50,6 +50,9 @@ TERRAFORM_VERSION_REGEX = r"^Terraform\sv([\d]+\.[\d]+\.[\d]+)$"
 OC_VERSIONS = ["4.12.46", "4.10.15"]
 OC_VERSION_REGEX = r"^Client\sVersion:\s([\d]+\.[\d]+\.[\d]+)$"
 
+HELM_VERSIONS = ["3.11.1"]
+HELM_VERSION_REGEX = r"^version.BuildInfo{Version:\"v([\d]+\.[\d]+\.[\d]+)\".*$"
+
 
 def before_breadcrumb(crumb, hint):
     # https://docs.sentry.io/platforms/python/configuration/filtering/
@@ -1394,6 +1397,7 @@ def openshift_resources(
 @use_jump_host()
 @binary(["oc", "ssh"])
 @binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
+@binary_version("helm", ["version"], HELM_VERSION_REGEX, HELM_VERSIONS)
 @click.option("--saas-file-name", default=None, help="saas-file to act on.")
 @click.option("--env-name", default=None, help="environment to deploy to.")
 @trigger_integration

reconcile/utils/helm.py

@@ -1,6 +1,6 @@
 import json
 import tempfile
-from collections.abc import Mapping
+from collections.abc import Iterable, Mapping
 from subprocess import (
     CalledProcessError,
     run,
@@ -9,6 +9,7 @@ from typing import Any
 
 import yaml
 
+from reconcile.utils import git
 from reconcile.utils.runtime.sharding import ShardSpec
 
 
@@ -23,7 +24,11 @@ class JSONEncoder(json.JSONEncoder):
         return super().default(o)
 
 
-def template(values: Mapping[str, Any]) -> Mapping[str, Any]:
+def do_template(
+    values: Mapping[str, Any],
+    path: str,
+    name: str,
+) -> str:
     try:
         with tempfile.NamedTemporaryFile(mode="w+", encoding="locale") as values_file:
             values_file.write(json.dumps(values, cls=JSONEncoder))
@@ -31,9 +36,9 @@ def template(values: Mapping[str, Any]) -> Mapping[str, Any]:
             cmd = [
                 "helm",
                 "template",
-                "./helm/qontract-reconcile",
+                path,
                 "-n",
-                "qontract-reconcile",
+                name,
                 "-f",
                 values_file.name,
             ]
@@ -46,4 +51,26 @@ def template(values: Mapping[str, Any]) -> Mapping[str, Any]:
             msg += f" {e.stderr.decode()}"
         raise HelmTemplateError(msg)
 
-    return yaml.safe_load(result.stdout.decode())
+    return result.stdout.decode()
+
+
+def template(
+    values: Mapping[str, Any],
+    path: str = "./helm/qontract-reconcile",
+    name: str = "qontract-reconcile",
+) -> Mapping[str, Any]:
+    return yaml.safe_load(do_template(values=values, path=path, name=name))
+
+
+def template_all(
+    url: str,
+    path: str,
+    name: 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)
+        )

reconcile/utils/saasherder/saasherder.py

@@ -39,6 +39,7 @@ from sretoolbox.utils import (
 
 from reconcile.github_org import get_default_config
 from reconcile.status import RunningState
+from reconcile.utils import helm
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.jenkins_api import JenkinsApi
 from reconcile.utils.jjb_client import JJB
@@ -1034,6 +1035,21 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 )
                 raise
 
+        elif provider == "helm":
+            ssl_verify = (
+                self.gitlab.ssl_verify
+                if self.gitlab and url.startswith(self.gitlab.server)
+                else True
+            )
+            html_url = f"{url}/tree/{target.ref}{path}"
+            resources = helm.template_all(
+                url=url,
+                path=path,
+                name=resource_template_name,
+                values=target.parameters or {},
+                ssl_verify=ssl_verify,
+            )
+
         else:
             logging.error(
                 f"[{saas_file_name}/{resource_template_name}] "