paasta-tools 1.4.3__tar.gz → 1.4.5__tar.gz

{paasta-tools-1.4.3/paasta_tools.egg-info → paasta-tools-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.4.3
+Version: 1.4.5
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.4.3 → paasta-tools-1.4.5}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.4.3"
+__version__ = "1.4.5"

{paasta-tools-1.4.3 → paasta-tools-1.4.5}/paasta_tools/cli/cmds/logs.py

@@ -97,7 +97,7 @@ def add_subparser(subparsers) -> None:
     status_parser.add_argument(
         "-c",
         "--cluster",
-        help="The cluster to see relevant logs for. Defaults to all clusters to which this service is deployed.",
+        help="The cluster to see relevant logs for.",
         nargs=1,
     ).completer = completer_clusters
     status_parser.add_argument(
@@ -1195,12 +1195,10 @@ class VectorLogsReader(LogReader):
         stream_name = get_log_name_for_service(service, prefix="app_output")
         superregion = self.get_superregion_for_cluster(clusters[0])
         reader = S3LogsReader(superregion)
-        start_date = start_time.date()
-        end_date = end_time.date()
         aggregated_logs: List[Dict[str, Any]] = []
 
         for line in reader.get_log_reader(
-            log_name=stream_name, min_date=start_date, max_date=end_date
+            log_name=stream_name, start_datetime=start_time, end_datetime=end_time
         ):
             if paasta_log_line_passes_filter(
                 line,

{paasta-tools-1.4.3 → paasta-tools-1.4.5}/paasta_tools/setup_kubernetes_cr.py

@@ -49,11 +49,15 @@ from paasta_tools.utils import get_config_hash
 from paasta_tools.utils import get_git_sha_from_dockerurl
 from paasta_tools.utils import load_all_configs
 from paasta_tools.utils import load_system_paasta_config
+from paasta_tools.vitesscluster_tools import load_vitess_service_instance_configs
 
 
 log = logging.getLogger(__name__)
 
 
+INSTANCE_TYPE_TO_CONFIG_LOADER = {"vitesscluster": load_vitess_service_instance_configs}
+
+
 class StdoutKubeClient:
     """Replace all destructive operations in Kubernetes APIs with
     writing out YAML to stdout."""
@@ -352,6 +356,13 @@ def reconcile_kubernetes_resource(
                 load_deployments=True,
                 soa_dir=DEFAULT_SOA_DIR,
             )
+            if crd.file_prefix in INSTANCE_TYPE_TO_CONFIG_LOADER:
+                config = INSTANCE_TYPE_TO_CONFIG_LOADER[crd.file_prefix](
+                    service=service,
+                    instance=inst,
+                    cluster=cluster,
+                    soa_dir=DEFAULT_SOA_DIR,
+                )
             git_sha = get_git_sha_from_dockerurl(soa_config.get_docker_url(), long=True)
             formatted_resource = format_custom_resource(
                 instance_config=config,

{paasta-tools-1.4.3 → paasta-tools-1.4.5}/paasta_tools/utils.py

@@ -2022,6 +2022,12 @@ class SystemPaastaConfigDict(TypedDict, total=False):
     use_multiple_log_readers: Optional[List[str]]
     service_auth_token_settings: ProjectedSAVolume
     always_authenticating_services: List[str]
+    mysql_port_mappings: Dict
+    vitess_images: Dict
+    superregion_to_region_mapping: Dict
+    vitess_tablet_types: List[str]
+    vitess_tablet_pool_type_mapping: Dict
+    vitess_throttling_config: Dict
 
 
 def load_system_paasta_config(
@@ -2733,6 +2739,52 @@ class SystemPaastaConfig:
     def get_always_authenticating_services(self) -> List[str]:
         return self.config_dict.get("always_authenticating_services", [])
 
+    def get_mysql_port_mappings(self) -> Dict:
+        return self.config_dict.get("mysql_port_mappings", {})
+
+    def get_vitess_images(self) -> Dict:
+        return self.config_dict.get(
+            "vitess_images",
+            {
+                "vtctld_image": "docker-paasta.yelpcorp.com:443/vitess_base:v16.0.3",
+                "vtgate_image": "docker-paasta.yelpcorp.com:443/vitess_base:v16.0.3",
+                "vttablet_image": "docker-paasta.yelpcorp.com:443/vitess_base:v16.0.3",
+                "vtadmin_image": "docker-paasta.yelpcorp.com:443/vtadmin:v16.0.3",
+            },
+        )
+
+    def get_superregion_to_region_mapping(self) -> Dict:
+        return self.config_dict.get("superregion_to_region_mapping", {})
+
+    def get_vitess_tablet_types(self) -> List:
+        return self.config_dict.get("vitess_tablet_types", ["primary", "migration"])
+
+    def get_vitess_tablet_pool_type_mapping(self) -> Dict:
+        return self.config_dict.get("vitess_tablet_pool_type_mapping", {})
+
+    def get_vitess_throttling_config(self) -> Dict:
+        return self.config_dict.get(
+            "vitess_throttling_config",
+            {
+                "migration": {
+                    "throttle_query_table": "migration_replication_delay",
+                    "throttle_metrics_threshold": "7200",
+                },
+                "read": {
+                    "throttle_query_table": "read_replication_delay",
+                    "throttle_metrics_threshold": "3",
+                },
+                "reporting": {
+                    "throttle_query_table": "reporting_replication_delay",
+                    "throttle_metrics_threshold": "7200",
+                },
+                "primary": {
+                    "throttle_query_table": "read_replication_delay",
+                    "throttle_metrics_threshold": "3",
+                },
+            },
+        )
+
 
 def _run(
     command: Union[str, List[str]],