paasta-tools 1.21.3__py3-none-any.whl → 1.22.0__py3-none-any.whl

paasta_tools/setup_kubernetes_job.py

@@ -21,9 +21,12 @@ Command line options:
 - -v, --verbose: Verbose output
 """
 import argparse
+import json
 import logging
 import sys
+import time
 import traceback
+from typing import Dict
 from typing import List
 from typing import Optional
 from typing import Sequence
@@ -36,7 +39,11 @@ from paasta_tools.kubernetes.application.controller_wrappers import Application
 from paasta_tools.kubernetes.application.controller_wrappers import (
     get_application_wrapper,
 )
+from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAME
+from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE
 from paasta_tools.kubernetes_tools import ensure_namespace
+from paasta_tools.kubernetes_tools import get_namespaced_configmap
+from paasta_tools.kubernetes_tools import HpaOverride
 from paasta_tools.kubernetes_tools import InvalidKubernetesConfig
 from paasta_tools.kubernetes_tools import KubeClient
 from paasta_tools.kubernetes_tools import KubernetesDeploymentConfig
@@ -129,6 +136,8 @@ def main() -> None:
     kube_client = KubeClient()
     service_instances_valid = True
 
+    hpa_overrides = get_hpa_overrides(kube_client)
+
     # validate the service_instance names
     service_instances_with_valid_names = get_service_instances_with_valid_names(
         service_instances=args.service_instance_list
@@ -162,6 +171,7 @@ def main() -> None:
             soa_dir=soa_dir,
             metrics_interface=deploy_metrics,
             eks=args.eks,
+            hpa_overrides=hpa_overrides,
         )
     else:
         setup_kube_succeeded = False
@@ -239,6 +249,92 @@ def get_kubernetes_deployment_config(
     return service_instance_configs_list
 
 
+def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverride]]:
+    """
+    Load autoscaling overrides from the ConfigMap once.
+
+    This function reads the "paasta-autoscaling-overrides" ConfigMap in the "paasta" namespace
+    and extracts all valid (non-expired) overrides to return a dictionary mapping
+    service.instance pairs to override data (currently, just min_instances and when the
+    override should expire by).
+
+    The incoming ConfigMap is expected to have the following format:
+    {
+        $SERVICE_A.$INSTANCE_A: {
+            "min_instances": 2,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+        $SERVICE_A.$INSTANCE_B: {
+            "min_instances": 3,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+            ...
+        },
+        $SERVICE_B.$INSTANCE_A: {
+            "min_instances": 1,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+        $SERVICE_B.$INSTANCE_B: {
+            "min_instances": 2,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+        ...
+    }
+    """
+    overrides: Dict[str, Dict[str, HpaOverride]] = {}
+    try:
+        configmap = get_namespaced_configmap(
+            name=AUTOSCALING_OVERRIDES_CONFIGMAP_NAME,
+            namespace=AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE,
+            kube_client=kube_client,
+        )
+
+        if configmap.data:
+            current_time = time.time()
+
+            for service_instance, override_json in configmap.data.items():
+                try:
+                    service, instance = service_instance.split(".")
+                    override_metadata = json.loads(override_json)
+                    expire_after = override_metadata.get("expire_after")
+                    min_instances = override_metadata.get("min_instances")
+
+                    if expire_after and min_instances:
+                        if current_time < expire_after:
+                            if service not in overrides:
+                                overrides[service] = {}
+
+                            overrides[service][instance] = {
+                                "min_instances": min_instances,
+                                "expire_after": expire_after,
+                            }
+                            log.info(
+                                f"Found valid HPA override for {service}: "
+                                f"{override_metadata.get('min_instances')} (expires at {expire_after})"
+                            )
+                        else:
+                            log.info(
+                                f"Ignoring expired HPA override for {service}.{instance}"
+                                f"(expired at {expire_after})"
+                            )
+                    else:
+                        log.warning(
+                            f"Invalid HPA override for {service}.{instance}: "
+                            f"missing 'min_instances' or 'expire_after': {override_metadata}"
+                        )
+                except Exception:
+                    log.exception(
+                        f"Error parsing override for {service} - proceeding without overrides for this service."
+                    )
+    except Exception:
+        # If ConfigMap doesn't exist or there's an error, just return empty dict
+        log.exception(
+            f"Unable to load the {AUTOSCALING_OVERRIDES_CONFIGMAP_NAME} ConfigMap - proceeding without overrides"
+        )
+
+    return overrides
+
+
 def setup_kube_deployments(
     kube_client: KubeClient,
     cluster: str,
@@ -249,6 +345,7 @@ def setup_kube_deployments(
     soa_dir: str = DEFAULT_SOA_DIR,
     metrics_interface: metrics_lib.BaseMetrics = metrics_lib.NoMetrics("paasta"),
     eks: bool = False,
+    hpa_overrides: Optional[Dict[str, Dict[str, HpaOverride]]] = None,
 ) -> bool:
 
     if not service_instance_configs_list:
@@ -260,12 +357,17 @@ def setup_kube_deployments(
         for deployment in existing_kube_deployments
     }
 
+    hpa_overrides = hpa_overrides or {}
+
     applications = [
         create_application_object(
             cluster=cluster,
             soa_dir=soa_dir,
             service_instance_config=service_instance,
             eks=eks,
+            hpa_override=hpa_overrides.get(service_instance.service, {}).get(
+                service_instance.instance, None
+            ),
         )
         if service_instance
         else (_, None)
@@ -337,6 +439,7 @@ def create_application_object(
     soa_dir: str,
     service_instance_config: Union[KubernetesDeploymentConfig, EksDeploymentConfig],
     eks: bool = False,
+    hpa_override: Optional[HpaOverride] = None,
 ) -> Tuple[bool, Optional[Application]]:
     try:
         formatted_application = service_instance_config.format_kubernetes_app()
@@ -344,8 +447,9 @@ def create_application_object(
         log.error(traceback.format_exc())
         return False, None
 
-    app = get_application_wrapper(formatted_application)
+    app = get_application_wrapper(formatted_application, hpa_override)
     app.load_local_config(soa_dir, cluster, eks)
+
     return True, app
 
 

paasta_tools/smartstack_tools.py

@@ -473,7 +473,7 @@ def get_service_discovery_providers(
         elif name == "envoy":
             providers.append(EnvoyServiceDiscovery(system_paasta_config))
         else:
-            log.warn("unknown provider")
+            log.warning("unknown provider")
     return providers
 
 
@@ -530,7 +530,7 @@ class BaseReplicationChecker(ReplicationChecker):
                         )
                         break
                     except Exception as e:
-                        log.warn(
+                        log.warning(
                             f"Error while getting replication info for {location} from {hostname}: {e}"
                         )
                         if hostname == hostnames[-1]:

paasta_tools/spark_tools.py

@@ -133,7 +133,7 @@ def setup_volume_mounts(volumes: List[DockerVolume]) -> Dict[str, str]:
         )
 
         if host_path in seen_paths:
-            log.warn(f"Skipping {host_path} - already added a binding for it.")
+            log.warning(f"Skipping {host_path} - already added a binding for it.")
             continue
         seen_paths.add(host_path)
 
@@ -209,7 +209,7 @@ def auto_add_timeout_for_spark_job(
             f"'timeout' could not be added to spark command: '{cmd}' due to error '{e}'. "
             "Please report to #spark."
         )
-        log.warn(err_msg)
+        log.warning(err_msg)
         print(PaastaColors.red(err_msg))
     return cmd
 

{paasta_tools-1.21.3.data → paasta_tools-1.22.0.data}/scripts/generate_deployments_for_service.py

@@ -130,6 +130,10 @@ def get_deploy_group_mappings(
     v2_mappings: V2_Mappings = {"deployments": {}, "controls": {}}
     git_url = get_git_url(service=service, soa_dir=soa_dir)
 
+    # Some pseudo-services like toolboxes explicitly have no git_url, and therefore no deployments
+    if git_url is None:
+        return mappings, v2_mappings
+
     # Most of the time of this function is in two parts:
     # 1. getting remote refs from git. (Mostly IO, just waiting for git to get back to us.)
     # 2. loading instance configs. (Mostly CPU, copy.deepcopying yaml over and over again)

{paasta_tools-1.21.3.data → paasta_tools-1.22.0.data}/scripts/setup_istio_mesh.py

@@ -103,7 +103,7 @@ def load_smartstack_namespaces(soa_dir: str = DEFAULT_SOA_DIR) -> Mapping:
                 for (ns, details) in svc_namespaces.items():
                     namespaces[f"{dir}.{ns}"] = details
         except Exception as err:
-            log.warn(f"Failed to load namespaces for {dir}: {err}")
+            log.warning(f"Failed to load namespaces for {dir}: {err}")
 
     return namespaces
 

{paasta_tools-1.21.3.data → paasta_tools-1.22.0.data}/scripts/setup_kubernetes_job.py

@@ -21,9 +21,12 @@ Command line options:
 - -v, --verbose: Verbose output
 """
 import argparse
+import json
 import logging
 import sys
+import time
 import traceback
+from typing import Dict
 from typing import List
 from typing import Optional
 from typing import Sequence
@@ -36,7 +39,11 @@ from paasta_tools.kubernetes.application.controller_wrappers import Application
 from paasta_tools.kubernetes.application.controller_wrappers import (
     get_application_wrapper,
 )
+from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAME
+from paasta_tools.kubernetes_tools import AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE
 from paasta_tools.kubernetes_tools import ensure_namespace
+from paasta_tools.kubernetes_tools import get_namespaced_configmap
+from paasta_tools.kubernetes_tools import HpaOverride
 from paasta_tools.kubernetes_tools import InvalidKubernetesConfig
 from paasta_tools.kubernetes_tools import KubeClient
 from paasta_tools.kubernetes_tools import KubernetesDeploymentConfig
@@ -129,6 +136,8 @@ def main() -> None:
     kube_client = KubeClient()
     service_instances_valid = True
 
+    hpa_overrides = get_hpa_overrides(kube_client)
+
     # validate the service_instance names
     service_instances_with_valid_names = get_service_instances_with_valid_names(
         service_instances=args.service_instance_list
@@ -162,6 +171,7 @@ def main() -> None:
             soa_dir=soa_dir,
             metrics_interface=deploy_metrics,
             eks=args.eks,
+            hpa_overrides=hpa_overrides,
         )
     else:
         setup_kube_succeeded = False
@@ -239,6 +249,92 @@ def get_kubernetes_deployment_config(
     return service_instance_configs_list
 
 
+def get_hpa_overrides(kube_client: KubeClient) -> Dict[str, Dict[str, HpaOverride]]:
+    """
+    Load autoscaling overrides from the ConfigMap once.
+
+    This function reads the "paasta-autoscaling-overrides" ConfigMap in the "paasta" namespace
+    and extracts all valid (non-expired) overrides to return a dictionary mapping
+    service.instance pairs to override data (currently, just min_instances and when the
+    override should expire by).
+
+    The incoming ConfigMap is expected to have the following format:
+    {
+        $SERVICE_A.$INSTANCE_A: {
+            "min_instances": 2,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+        $SERVICE_A.$INSTANCE_B: {
+            "min_instances": 3,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+            ...
+        },
+        $SERVICE_B.$INSTANCE_A: {
+            "min_instances": 1,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+        $SERVICE_B.$INSTANCE_B: {
+            "min_instances": 2,
+            "expire_after": "2023-10-01T00:00:00Z"
+        },
+        ...
+    }
+    """
+    overrides: Dict[str, Dict[str, HpaOverride]] = {}
+    try:
+        configmap = get_namespaced_configmap(
+            name=AUTOSCALING_OVERRIDES_CONFIGMAP_NAME,
+            namespace=AUTOSCALING_OVERRIDES_CONFIGMAP_NAMESPACE,
+            kube_client=kube_client,
+        )
+
+        if configmap.data:
+            current_time = time.time()
+
+            for service_instance, override_json in configmap.data.items():
+                try:
+                    service, instance = service_instance.split(".")
+                    override_metadata = json.loads(override_json)
+                    expire_after = override_metadata.get("expire_after")
+                    min_instances = override_metadata.get("min_instances")
+
+                    if expire_after and min_instances:
+                        if current_time < expire_after:
+                            if service not in overrides:
+                                overrides[service] = {}
+
+                            overrides[service][instance] = {
+                                "min_instances": min_instances,
+                                "expire_after": expire_after,
+                            }
+                            log.info(
+                                f"Found valid HPA override for {service}: "
+                                f"{override_metadata.get('min_instances')} (expires at {expire_after})"
+                            )
+                        else:
+                            log.info(
+                                f"Ignoring expired HPA override for {service}.{instance}"
+                                f"(expired at {expire_after})"
+                            )
+                    else:
+                        log.warning(
+                            f"Invalid HPA override for {service}.{instance}: "
+                            f"missing 'min_instances' or 'expire_after': {override_metadata}"
+                        )
+                except Exception:
+                    log.exception(
+                        f"Error parsing override for {service} - proceeding without overrides for this service."
+                    )
+    except Exception:
+        # If ConfigMap doesn't exist or there's an error, just return empty dict
+        log.exception(
+            f"Unable to load the {AUTOSCALING_OVERRIDES_CONFIGMAP_NAME} ConfigMap - proceeding without overrides"
+        )
+
+    return overrides
+
+
 def setup_kube_deployments(
     kube_client: KubeClient,
     cluster: str,
@@ -249,6 +345,7 @@ def setup_kube_deployments(
     soa_dir: str = DEFAULT_SOA_DIR,
     metrics_interface: metrics_lib.BaseMetrics = metrics_lib.NoMetrics("paasta"),
     eks: bool = False,
+    hpa_overrides: Optional[Dict[str, Dict[str, HpaOverride]]] = None,
 ) -> bool:
 
     if not service_instance_configs_list:
@@ -260,12 +357,17 @@ def setup_kube_deployments(
         for deployment in existing_kube_deployments
     }
 
+    hpa_overrides = hpa_overrides or {}
+
     applications = [
         create_application_object(
             cluster=cluster,
             soa_dir=soa_dir,
             service_instance_config=service_instance,
             eks=eks,
+            hpa_override=hpa_overrides.get(service_instance.service, {}).get(
+                service_instance.instance, None
+            ),
         )
         if service_instance
         else (_, None)
@@ -337,6 +439,7 @@ def create_application_object(
     soa_dir: str,
     service_instance_config: Union[KubernetesDeploymentConfig, EksDeploymentConfig],
     eks: bool = False,
+    hpa_override: Optional[HpaOverride] = None,
 ) -> Tuple[bool, Optional[Application]]:
     try:
         formatted_application = service_instance_config.format_kubernetes_app()
@@ -344,8 +447,9 @@ def create_application_object(
         log.error(traceback.format_exc())
         return False, None
 
-    app = get_application_wrapper(formatted_application)
+    app = get_application_wrapper(formatted_application, hpa_override)
     app.load_local_config(soa_dir, cluster, eks)
+
     return True, app
 
 

{paasta_tools-1.21.3.dist-info → paasta_tools-1.22.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.21.3
+Version: 1.22.0
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com
@@ -58,7 +58,7 @@ Requires-Dist: requests-cache >=0.4.10
 Requires-Dist: retry
 Requires-Dist: ruamel.yaml
 Requires-Dist: sensu-plugin
-Requires-Dist: service-configuration-lib >=3.2.0
+Requires-Dist: service-configuration-lib >=3.3.2
 Requires-Dist: signalfx
 Requires-Dist: slackclient >=1.2.1
 Requires-Dist: sticht >=1.1.0