qontract-reconcile 0.10.1rc608__py3-none-any.whl → 0.10.1rc609__py3-none-any.whl

{qontract_reconcile-0.10.1rc608.dist-info → qontract_reconcile-0.10.1rc609.dist-info}/METADATA

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

@@ -9,7 +9,7 @@ reconcile/aws_iam_password_reset.py,sha256=NwErtrqgBiXr7eGCAHdtGGOx0S7-4JnSc29Ie
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=R2WFXUXLTB4sWMi4GeA4eegsuf_1-Q4vH8M0Toh3Ij4,5036
-reconcile/cli.py,sha256=WqujVeoWJhYWxV-RmpIf4XYfR8JuyF4wHf1B2xOywcE,91518
+reconcile/cli.py,sha256=iYjF1R-M2FdokkMzjlCFennx-E9Go8xdJN5QGTFZMjU,91560
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w1h-alleW1QnCJFY4Qw,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
@@ -543,7 +543,7 @@ reconcile/utils/aggregated_list.py,sha256=pkYoBj7WwmaNgEefETqEOFTnQMcUzHE3mdsVdz
 reconcile/utils/amtool.py,sha256=JV5-to_e_FaIcvJWTKYA9d6L3LwzwijM0MjUWn83eD4,2204
 reconcile/utils/aws_api.py,sha256=sgmxCXYle0jjmMHPpBOAKl-kWTDWwuc0AlLO2NmDB8M,65612
 reconcile/utils/aws_helper.py,sha256=6Nfgsz0aQ97LBAJ0JBRdnPaFTAkEBSqXvCH6_pVIWdw,2006
-reconcile/utils/binary.py,sha256=3IBnwjKakHM367skPPvG6yVSQYjKt5muQlFNdoa63DU,2352
+reconcile/utils/binary.py,sha256=EsOGg82Y2QJh91SGJE0tYpBKqU0iaaagQVoYONBtQn8,2359
 reconcile/utils/config.py,sha256=aId5zrPjM_84u_T4yTRE_Psu3zo5-5_JCR6_7Wgv5UQ,990
 reconcile/utils/constants.py,sha256=pOUd97bqZdsAu5RWJ8NUs9cwCY7K9y0eW9VVeJ4fZIU,138
 reconcile/utils/data_structures.py,sha256=VyKfnlNJTiRvZKNpfgIrjESQ2YgmEpWuPQXT14WA1vI,311
@@ -712,8 +712,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 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.1rc608.dist-info/METADATA,sha256=bm2qV8JJIhYIkROp4N8zS-B8Jp7Wkk9WT9oVJfNXXIA,2382
-qontract_reconcile-0.10.1rc608.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc608.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc608.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc608.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc609.dist-info/METADATA,sha256=oL9FPRy78cqHHZ7uyBOLtfr24QUHtZ_mv0Vc-ElwUOg,2382
+qontract_reconcile-0.10.1rc609.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc609.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc609.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc609.dist-info/RECORD,,

reconcile/cli.py

@@ -43,10 +43,10 @@ from reconcile.utils.runtime.runner import (
 )
 from reconcile.utils.unleash import get_feature_toggle_state
 
-TERRAFORM_VERSION = "0.13.7"
+TERRAFORM_VERSION = ["0.13.7"]
 TERRAFORM_VERSION_REGEX = r"^Terraform\sv([\d]+\.[\d]+\.[\d]+)$"
 
-OC_VERSION = "4.12.46"
+OC_VERSIONS = ["4.12.46", "4.10.15"]
 OC_VERSION_REGEX = r"^Client\sVersion:\s([\d]+\.[\d]+\.[\d]+)$"
 
 
@@ -793,7 +793,7 @@ def github_validator(ctx):
 @integration.command(short_help="Configures ClusterRolebindings in OpenShift clusters.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -812,7 +812,7 @@ def openshift_clusterrolebindings(ctx, thread_pool_size, internal, use_jump_host
 @integration.command(short_help="Configures Rolebindings in OpenShift clusters.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -831,7 +831,7 @@ def openshift_rolebindings(ctx, thread_pool_size, internal, use_jump_host):
 @integration.command(short_help="Manages OpenShift Groups.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -846,7 +846,7 @@ def openshift_groups(ctx, thread_pool_size, internal, use_jump_host):
 @integration.command(short_help="Deletion of users from OpenShift clusters.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -863,7 +863,7 @@ def openshift_users(ctx, thread_pool_size, internal, use_jump_host):
 )
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @vault_output_path
@@ -1032,7 +1032,7 @@ def jira_watcher(ctx):
     short_help="Watches for OpenShift upgrades and sends notifications."
 )
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @threaded()
 @internal()
 @use_jump_host()
@@ -1181,7 +1181,7 @@ def aws_support_cases_sos(ctx, gitlab_project_id, thread_pool_size):
 @integration.command(short_help="Manages OpenShift Resources.")
 @threaded()
 @binary(["oc", "ssh", "amtool"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @cluster_name
@@ -1216,7 +1216,7 @@ def openshift_resources(
 @throughput
 @use_jump_host()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_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
@@ -1258,7 +1258,7 @@ def openshift_saas_deploy(
     help="bundle sha to compare to to find changes",
 )
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @use_jump_host()
 @click.pass_context
 def openshift_saas_deploy_change_tester(
@@ -1293,7 +1293,7 @@ def saas_file_validator(ctx):
 @integration.command(short_help="Trigger deployments when a commit changed for a ref.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @include_trigger_trace
@@ -1316,7 +1316,7 @@ def openshift_saas_deploy_trigger_moving_commits(
 @integration.command(short_help="Trigger deployments when upstream job runs.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @include_trigger_trace
@@ -1339,7 +1339,7 @@ def openshift_saas_deploy_trigger_upstream_jobs(
 @integration.command(short_help="Trigger deployments when images are pushed.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @include_trigger_trace
@@ -1362,7 +1362,7 @@ def openshift_saas_deploy_trigger_images(
 @integration.command(short_help="Trigger deployments when configuration changes.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @include_trigger_trace
@@ -1385,7 +1385,7 @@ def openshift_saas_deploy_trigger_configs(
 @integration.command(short_help="Clean up deployment related resources.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -1444,7 +1444,7 @@ def gitlab_labeler(ctx, gitlab_project_id, gitlab_merge_request_id):
 @integration.command(short_help="Manages labels on OpenShift namespaces.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -1463,7 +1463,7 @@ def openshift_namespace_labels(ctx, thread_pool_size, internal, use_jump_host):
 @integration.command(short_help="Manages OpenShift Namespaces.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @cluster_name
@@ -1488,7 +1488,7 @@ def openshift_namespaces(
 @integration.command(short_help="Manages OpenShift NetworkPolicies.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -1508,7 +1508,7 @@ def openshift_network_policies(ctx, thread_pool_size, internal, use_jump_host):
 @threaded()
 @take_over()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -1529,7 +1529,7 @@ def openshift_limitranges(ctx, thread_pool_size, internal, use_jump_host, take_o
 @threaded()
 @take_over()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -1549,7 +1549,7 @@ def openshift_resourcequotas(ctx, thread_pool_size, internal, use_jump_host, tak
 @integration.command(short_help="Manages OpenShift Secrets from Vault.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @cluster_name
@@ -1574,7 +1574,7 @@ def openshift_vault_secrets(
 @integration.command(short_help="Manages OpenShift Routes.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @cluster_name
@@ -1899,7 +1899,7 @@ def template_renderer(ctx, app_interface_data_path):
 @threaded()
 @binary(["terraform", "oc", "git"])
 @binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @enable_deletion(default=False)
@@ -2922,7 +2922,7 @@ def resource_scraper(ctx, namespace_name, resource_kind, vault_output_path):
 @integration.command(short_help="Manages user access for GABI instances.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context
@@ -3056,7 +3056,7 @@ def vault_replication(ctx):
 @environment_name
 @threaded()
 @binary(["oc", "ssh", "helm"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.option(
@@ -3182,7 +3182,7 @@ def glitchtip_project_alerts(ctx, instance):
 @integration.command(short_help="Glitchtip project dsn as openshift secret.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.option("--instance", help="Reconcile just this instance.", default=None)
@@ -3203,7 +3203,7 @@ def glitchtip_project_dsn(ctx, thread_pool_size, internal, use_jump_host, instan
 @integration.command(short_help="Manages Skupper Networks.")
 @threaded()
 @binary(["oc", "ssh"])
-@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSION)
+@binary_version("oc", ["version", "--client"], OC_VERSION_REGEX, OC_VERSIONS)
 @internal()
 @use_jump_host()
 @click.pass_context

reconcile/utils/binary.py

@@ -25,7 +25,7 @@ def binary(binaries=None):
     return deco_binary
 
 
-def binary_version(binary, version_args, search_regex, expected_version):
+def binary_version(binary, version_args, search_regex, expected_versions):
     """Check that a binary exists and is a desired version"""
 
     def deco_binary_version(f):
@@ -62,10 +62,10 @@ def binary_version(binary, version_args, search_regex, expected_version):
                 )
 
             version = match.group(1)
-            if version != expected_version:
+            if version not in expected_versions:
                 raise Exception(
                     f"Binary version check for binary {binary} failed! "
-                    f"Expected: {expected_version}, found: {version}"
+                    f"Expected: {expected_versions}, found: {version}"
                 )
 
             f(*args, **kwargs)