paasta-tools 1.4.27__tar.gz → 1.4.29__tar.gz

{paasta-tools-1.4.27/paasta_tools.egg-info → paasta-tools-1.4.29}/PKG-INFO

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

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/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.27"
+__version__ = "1.4.29"

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/cli/cmds/spark_run.py

@@ -26,6 +26,7 @@ from service_configuration_lib.spark_config import UnsupportedClusterManagerExce
 from paasta_tools.cli.cmds.check import makefile_responds_to
 from paasta_tools.cli.cmds.cook_image import paasta_cook_image
 from paasta_tools.cli.utils import get_instance_config
+from paasta_tools.cli.utils import get_service_auth_token
 from paasta_tools.cli.utils import lazy_choices_completer
 from paasta_tools.cli.utils import list_instances
 from paasta_tools.clusterman import get_clusterman_metrics
@@ -337,6 +338,18 @@ def add_subparser(subparsers):
         default=None,
     )
 
+    list_parser.add_argument(
+        "--use-service-auth-token",
+        help=(
+            "Acquire service authentication token for the underlying instance,"
+            " and set it in the container environment"
+        ),
+        action="store_true",
+        dest="use_service_auth_token",
+        required=False,
+        default=False,
+    )
+
     aws_group = list_parser.add_argument_group(
         title="AWS credentials options",
         description="If --aws-credentials-yaml is specified, it overrides all "
@@ -795,6 +808,9 @@ def configure_and_run_docker_container(
     )  # type:ignore
     environment.update(extra_driver_envs)
 
+    if args.use_service_auth_token:
+        environment["YELP_SVC_AUTHZ_TOKEN"] = get_service_auth_token()
+
     webui_url = get_webui_url(spark_conf["spark.ui.port"])
     webui_url_msg = PaastaColors.green(f"\nSpark monitoring URL: ") + f"{webui_url}\n"
 

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/cli/cmds/status.py

@@ -95,18 +95,14 @@ from paasta_tools.utils import load_system_paasta_config
 from paasta_tools.utils import PaastaColors
 from paasta_tools.utils import remove_ansi_escape_sequences
 from paasta_tools.utils import SystemPaastaConfig
-from paasta_tools.vitesscell_tools import VitessCellConfig
-from paasta_tools.vitesscluster_tools import VitessClusterConfig
-from paasta_tools.vitesskeyspace_tools import VitessKeyspaceConfig
+from paasta_tools.vitesscluster_tools import VitessDeploymentConfig
 
 FLINK_STATUS_MAX_THREAD_POOL_WORKERS = 50
 ALLOWED_INSTANCE_CONFIG: Sequence[Type[InstanceConfig]] = [
     FlinkDeploymentConfig,
     FlinkEksDeploymentConfig,
     CassandraClusterDeploymentConfig,
-    VitessClusterConfig,
-    VitessCellConfig,
-    VitessKeyspaceConfig,
+    VitessDeploymentConfig,
     KafkaClusterDeploymentConfig,
     KubernetesDeploymentConfig,
     EksDeploymentConfig,
@@ -119,9 +115,7 @@ DEPLOYMENT_INSTANCE_CONFIG: Sequence[Type[InstanceConfig]] = [
     FlinkDeploymentConfig,
     FlinkEksDeploymentConfig,
     CassandraClusterDeploymentConfig,
-    VitessClusterConfig,
-    VitessCellConfig,
-    VitessKeyspaceConfig,
+    VitessDeploymentConfig,
     KafkaClusterDeploymentConfig,
     KubernetesDeploymentConfig,
     EksDeploymentConfig,
@@ -143,9 +137,7 @@ InstanceStatusWriter = Callable[
 EKS_DEPLOYMENT_CONFIGS = [
     EksDeploymentConfig,
     FlinkEksDeploymentConfig,
-    VitessClusterConfig,
-    VitessCellConfig,
-    VitessKeyspaceConfig,
+    VitessDeploymentConfig,
 ]
 FLINK_DEPLOYMENT_CONFIGS = [FlinkDeploymentConfig, FlinkEksDeploymentConfig]
 

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/cli/schemas/smartstack_schema.json

@@ -257,6 +257,28 @@
                     "minimum_error_rps": {
                         "type": "integer",
                         "minimum": 0
+                    },
+                    "namespace_alert": {
+                        "type": "boolean"
+                    },
+                    "endpoints": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "name": {
+                                    "type": "string"
+                                },
+                                "error_threshold_ratio": {
+                                    "type": "number",
+                                    "minimum": 0,
+                                    "maximum": 1
+                                }
+                            },
+                            "required": [
+                                "name"
+                            ]
+                        }
                     }
                 }
             }

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/cli/utils.py

@@ -76,9 +76,7 @@ from paasta_tools.utils import PAASTA_K8S_INSTANCE_TYPES
 from paasta_tools.utils import PaastaColors
 from paasta_tools.utils import SystemPaastaConfig
 from paasta_tools.utils import validate_service_instance
-from paasta_tools.vitesscell_tools import load_vitess_cell_instance_config
-from paasta_tools.vitesscluster_tools import load_vitess_cluster_instance_config
-from paasta_tools.vitesskeyspace_tools import load_vitess_keyspace_instance_config
+from paasta_tools.vitesscluster_tools import load_vitess_instance_config
 
 try:
     from vault_tools.paasta_secret import get_client as get_vault_client
@@ -682,13 +680,7 @@ INSTANCE_TYPE_HANDLERS: Mapping[str, InstanceTypeHandler] = defaultdict(
         get_service_instance_list, load_kafkacluster_instance_config
     ),
     vitesscluster=InstanceTypeHandler(
-        get_service_instance_list, load_vitess_cluster_instance_config
-    ),
-    vitesscell=InstanceTypeHandler(
-        get_service_instance_list, load_vitess_cell_instance_config
-    ),
-    vitesskeyspace=InstanceTypeHandler(
-        get_service_instance_list, load_vitess_keyspace_instance_config
+        get_service_instance_list, load_vitess_instance_config
     ),
     nrtsearchservice=InstanceTypeHandler(
         get_service_instance_list, load_nrtsearchservice_instance_config
@@ -721,13 +713,7 @@ LONG_RUNNING_INSTANCE_TYPE_HANDLERS: Mapping[
         get_service_instance_list, load_kafkacluster_instance_config
     ),
     vitesscluster=LongRunningInstanceTypeHandler(
-        get_service_instance_list, load_vitess_cluster_instance_config
-    ),
-    vitesscell=LongRunningInstanceTypeHandler(
-        get_service_instance_list, load_vitess_cell_instance_config
-    ),
-    vitesskeyspace=LongRunningInstanceTypeHandler(
-        get_service_instance_list, load_vitess_keyspace_instance_config
+        get_service_instance_list, load_vitess_instance_config
     ),
     nrtsearchservice=LongRunningInstanceTypeHandler(
         get_service_instance_list, load_nrtsearchservice_instance_config

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/instance/kubernetes.py

@@ -33,9 +33,7 @@ from paasta_tools import kubernetes_tools
 from paasta_tools import monkrelaycluster_tools
 from paasta_tools import nrtsearchservice_tools
 from paasta_tools import smartstack_tools
-from paasta_tools import vitesscell_tools
 from paasta_tools import vitesscluster_tools
-from paasta_tools import vitesskeyspace_tools
 from paasta_tools.cli.utils import LONG_RUNNING_INSTANCE_TYPE_HANDLERS
 from paasta_tools.instance.hpa_metrics_parser import HPAMetricsDict
 from paasta_tools.instance.hpa_metrics_parser import HPAMetricsParser
@@ -59,8 +57,6 @@ INSTANCE_TYPES_CR = {
     "cassandracluster",
     "kafkacluster",
     "vitesscluster",
-    "vitesscell",
-    "vitesskeyspace",
 }
 INSTANCE_TYPES_K8S = {
     "cassandracluster",
@@ -76,8 +72,6 @@ INSTANCE_TYPE_CR_ID = dict(
     cassandracluster=cassandracluster_tools.cr_id,
     kafkacluster=kafkacluster_tools.cr_id,
     vitesscluster=vitesscluster_tools.cr_id,
-    vitesscell=vitesscell_tools.cr_id,
-    vitesskeyspace=vitesskeyspace_tools.cr_id,
     nrtsearchservice=nrtsearchservice_tools.cr_id,
     nrtsearchserviceeks=nrtsearchservice_tools.cr_id,
     monkrelaycluster=monkrelaycluster_tools.cr_id,

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/setup_kubernetes_cr.py

@@ -49,19 +49,13 @@ 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.vitesscell_tools import load_vitess_cell_instance_configs
-from paasta_tools.vitesscluster_tools import load_vitess_cluster_instance_configs
-from paasta_tools.vitesskeyspace_tools import load_vitess_keyspace_instance_configs
+from paasta_tools.vitesscluster_tools import load_vitess_service_instance_configs
 
 
 log = logging.getLogger(__name__)
 
 
-INSTANCE_TYPE_TO_CONFIG_LOADER = {
-    "vitesscluster": load_vitess_cluster_instance_configs,
-    "vitesscell": load_vitess_cell_instance_configs,
-    "vitesskeyspace": load_vitess_keyspace_instance_configs,
-}
+INSTANCE_TYPE_TO_CONFIG_LOADER = {"vitesscluster": load_vitess_service_instance_configs}
 
 
 class StdoutKubeClient:

{paasta-tools-1.4.27 → paasta-tools-1.4.29}/paasta_tools/utils.py

@@ -137,8 +137,6 @@ INSTANCE_TYPES = (
     "cassandracluster",
     "kafkacluster",
     "vitesscluster",
-    "vitesscell",
-    "vitesskeyspace",
     "monkrelays",
     "nrtsearchservice",
     "nrtsearchserviceeks",
@@ -158,8 +156,6 @@ INSTANCE_TYPE_TO_K8S_NAMESPACE = {
     "cassandracluster": "paasta-cassandraclusters",
     "kafkacluster": "paasta-kafkaclusters",
     "vitesscluster": "paasta-vitessclusters",
-    "vitesscell": "paasta-vitessclusters",
-    "vitesskeyspace": "paasta-vitessclusters",
     "nrtsearchservice": "paasta-nrtsearchservices",
     "nrtsearchserviceeks": "paasta-nrtsearchservices",
 }