qontract-reconcile 0.10.1rc749__py3-none-any.whl → 0.10.1rc751__py3-none-any.whl

{qontract_reconcile-0.10.1rc749.dist-info → qontract_reconcile-0.10.1rc751.dist-info}/METADATA

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

@@ -109,7 +109,7 @@ reconcile/sql_query.py,sha256=zZkihfI-f0JjMez9A83HGTlVwqqbkP8lLjRg-z7sOUU,25878
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=nA74_133jukxVShjPKJpkXOA3vggDTTEhYTegoXbN1M,8632
 reconcile/terraform_aws_route53.py,sha256=R8eZHlvP368nvtmLd_cMSK3RGxD7jso9qE7NP92iniU,9986
-reconcile/terraform_cloudflare_dns.py,sha256=auU4bzeLwd4S8D8oqpqJbrCUoEdELXrgi7vHOedjYFk,13332
+reconcile/terraform_cloudflare_dns.py,sha256=MZO3_2Hb0BhNkOTWIm2UHvR-SPKvLsk2l_fHNk4WOrk,13471
 reconcile/terraform_cloudflare_resources.py,sha256=EbQQaoDnZ7brvRCpbFtwlD7KLk2hDVNcjhrJGaAywEk,15023
 reconcile/terraform_cloudflare_users.py,sha256=1EbTHwJgiPkJpMP-Ag340QNgGK3mXn3dcC3DpLakudM,13987
 reconcile/terraform_repo.py,sha256=tQkMUEDEB6QfuWYwiW7H-NnX4SHxYK7mLZYZffKj-hE,16301
@@ -621,7 +621,7 @@ reconcile/utils/jenkins_api.py,sha256=MyJSB_S3uYf3sXnt9t03-gZNQ7tbdd7Wusv3MoF2fR
 reconcile/utils/jira_client.py,sha256=sCswWH-SctzPSElI9_oHv9LKuNnPfjP_FIOizxqh6nE,7693
 reconcile/utils/jjb_client.py,sha256=Pdy0dLCFvD6GPCaC0tZydYgkVJPOxYXIiwWECZaFJBU,14551
 reconcile/utils/jsonpath.py,sha256=NRpAEijKN4cMDjo7qivNPqpm0__GQQ1TiE0PBEBO45s,5572
-reconcile/utils/jump_host.py,sha256=AdwmCZYNhRe53VwV2iAsUdVyUdVtSd4REmdThJDkM5w,4973
+reconcile/utils/jump_host.py,sha256=ovcJ0quuHW-yxuSXvyzmOdTs4pkGZEhYfy6jIRMz9HU,5209
 reconcile/utils/keycloak.py,sha256=UqOsAcHKmmIunroWB5YzC1fUZ3S3aq6L7trn6vLRmXY,3395
 reconcile/utils/ldap_client.py,sha256=ho4veSrHqQWs0YhLFyKeD-duCwY8Nc5gUIA5qLENuMY,2502
 reconcile/utils/lean_terraform_client.py,sha256=zReyNPJbr2uOdrdh8Qfe-OZQBoRwxb5Za_ddeoUCYVk,4064
@@ -778,8 +778,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc749.dist-info/METADATA,sha256=GRynYliT4W9vldAPG4g1WPRh010gG9Zk7BAX643Wico,2382
-qontract_reconcile-0.10.1rc749.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc749.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc749.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc749.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc751.dist-info/METADATA,sha256=siqrJyv1zzhjJ0bILXpBrFQywzS0NHPrPjwPEOPCshs,2382
+qontract_reconcile-0.10.1rc751.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc751.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc751.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc751.dist-info/RECORD,,

reconcile/terraform_cloudflare_dns.py

@@ -10,6 +10,8 @@ from typing import (
     Sequence,
 )
 
+from deepdiff import DeepHash
+
 from reconcile.gql_definitions.terraform_cloudflare_dns import (
     app_interface_cloudflare_dns_settings,
     terraform_cloudflare_zones,
@@ -204,13 +206,17 @@ class TerraformCloudflareDNSIntegration(
     ) -> dict[str, Any]:
         desired_state = self._get_cloudflare_desired_state()
 
-        # return {"zones":desired_state.zones}
-        return desired_state.dict()
+        return {
+            "state": {
+                z.identifier: {"shard": z.identifier, "hash": DeepHash(z).get(z)}
+                for z in desired_state.zones or []
+            }
+        }
 
     def get_desired_state_shard_config(self) -> DesiredStateShardConfig:
         return DesiredStateShardConfig(
             shard_arg_name="selected_zone",
-            shard_path_selectors={"zones[*].identifier"},
+            shard_path_selectors={"state.*.shard"},
             sharded_run_review=lambda proposal: len(proposal.proposed_shards) <= 2,
         )
 

reconcile/utils/jump_host.py

@@ -128,12 +128,14 @@ class JumpHostSSH(JumpHostBase):
             if self._local_port not in JumpHostSSH.bastion_tunnel:
                 # Hide connect messages from sshtunnel
                 with toggle_logger():
+                    # equivalent to: ssh -i identity_file -L localhost:local_port:localhost:remote_port user@bastion
+                    # localhost:local_port -> bastion:22 -> bastion_localhost:remote_port(tinyproxy) -> cluster_host:6443
                     tunnel = SSHTunnelForwarder(
                         ssh_address_or_host=self._hostname,
                         ssh_port=self._port,
                         ssh_username=self._user,
                         ssh_pkey=self._identity_file,
-                        remote_bind_address=(self._hostname, self._remote_port),
+                        remote_bind_address=("localhost", self._remote_port),
                         local_bind_address=("localhost", self._local_port),
                     )
                     tunnel.start()