paasta-tools 1.8.2__tar.gz → 1.10.0__tar.gz

{paasta-tools-1.8.2/paasta_tools.egg-info → paasta-tools-1.10.0}/PKG-INFO

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

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/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.8.2"
+__version__ = "1.10.0"

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/api/api_docs/swagger.json

@@ -960,18 +960,6 @@
                         }
                     },
                     "description": "Nullable CassandraCluster instance status"
-                },
-                "vitesscluster": {
-                    "type": "object",
-                    "properties": {
-                        "status": {
-                            "$ref": "#/definitions/InstanceStatusVitessCluster"
-                        },
-                        "metadata": {
-                            "$ref": "#/definitions/InstanceMetadataVitessCluster"
-                        }
-                    },
-                    "description": "Nullable VitessCluster instance status and metadata"
                 }
             }
         },
@@ -1756,14 +1744,6 @@
             "type": "object",
             "description": "Cassandra instance status"
         },
-        "InstanceStatusVitessCluster": {
-            "type": "object",
-            "description": "VitessCluster instance status"
-        },
-        "InstanceMetadataVitessCluster": {
-            "type": "object",
-            "description": "VitessCluster instance metadata"
-        },
         "InstanceTasks": {
             "type": "array",
             "description": "List of tasks associated with instance",

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/cli/cmds/status.py

@@ -37,7 +37,6 @@ from typing import Optional
 from typing import Sequence
 from typing import Tuple
 from typing import Type
-from typing import TypedDict
 from typing import Union
 
 import a_sync
@@ -95,14 +94,12 @@ 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.vitesscluster_tools import VitessDeploymentConfig
 
 FLINK_STATUS_MAX_THREAD_POOL_WORKERS = 50
 ALLOWED_INSTANCE_CONFIG: Sequence[Type[InstanceConfig]] = [
     FlinkDeploymentConfig,
     FlinkEksDeploymentConfig,
     CassandraClusterDeploymentConfig,
-    VitessDeploymentConfig,
     KafkaClusterDeploymentConfig,
     KubernetesDeploymentConfig,
     EksDeploymentConfig,
@@ -115,7 +112,6 @@ DEPLOYMENT_INSTANCE_CONFIG: Sequence[Type[InstanceConfig]] = [
     FlinkDeploymentConfig,
     FlinkEksDeploymentConfig,
     CassandraClusterDeploymentConfig,
-    VitessDeploymentConfig,
     KafkaClusterDeploymentConfig,
     KubernetesDeploymentConfig,
     EksDeploymentConfig,
@@ -137,7 +133,6 @@ InstanceStatusWriter = Callable[
 EKS_DEPLOYMENT_CONFIGS = [
     EksDeploymentConfig,
     FlinkEksDeploymentConfig,
-    VitessDeploymentConfig,
 ]
 FLINK_DEPLOYMENT_CONFIGS = [FlinkDeploymentConfig, FlinkEksDeploymentConfig]
 
@@ -1906,250 +1901,6 @@ def print_kafka_status(
     return 0
 
 
-class EtcdLockServerStatus(TypedDict, total=False):
-    observedGeneration: int
-    available: str
-    clientServiceName: str
-
-
-class LockServerStatus(TypedDict, total=False):
-    etcd: EtcdLockServerStatus
-
-
-class VitessClusterCellStatus(TypedDict, total=False):
-    pendingChanges: str
-    gatewayAvailable: str
-
-
-class VitessClusterKeyspaceStatus(TypedDict, total=False):
-    pendingChanges: str
-    cells: List[str]
-    desiredShards: int
-    shards: int
-    readyShards: int
-    updatedShards: int
-    desiredTablets: int
-    tablets: int
-    readyTablets: int
-    updatedTablets: int
-
-
-class VitessDashboardStatus(TypedDict, total=False):
-    available: str
-    serviceName: str
-
-
-class VTAdminStatus(TypedDict, total=False):
-    available: str
-    serviceName: str
-
-
-class OrphanStatus(TypedDict, total=False):
-    reason: str
-    message: str
-
-
-class VitessClusterStatus(TypedDict, total=False):
-    observedGeneration: int
-    globalLockserver: LockServerStatus
-    gatewayServiceName: str
-    vitessDashboard: VitessDashboardStatus
-    cells: Dict[str, VitessClusterCellStatus]
-    keyspaces: Dict[str, VitessClusterKeyspaceStatus]
-    vtadmin: VTAdminStatus
-    orphanedCells: Dict[str, OrphanStatus]
-    orphanedKeyspaces: Dict[str, OrphanStatus]
-
-
-def print_vitess_status(
-    cluster: str,
-    service: str,
-    instance: str,
-    output: List[str],
-    vitess_status: Mapping[str, Any],
-    verbose: int = 0,
-) -> int:
-    tab = "    "
-    indent = 1
-
-    status: VitessClusterStatus = vitess_status.get("status")
-    if status is None:
-        output.append(
-            PaastaColors.red("indent * tab + Vitess cluster is not available yet")
-        )
-        return 1
-
-    output.append(indent * tab + "Vitess Cluster:")
-    indent += 1
-
-    output.append(
-        indent * tab
-        + "Observed Generation: "
-        + str(status.get("observedGeneration", 0))
-    )
-    output.append(
-        indent * tab + "Gateway Service Name: " + status.get("gatewayServiceName", "")
-    )
-
-    output.append(indent * tab + "Cells:")
-    indent += 1
-    cells: Dict[str, VitessClusterCellStatus] = status.get("cells")
-    if not cells:
-        output.append(
-            indent * tab + "Cells: " + PaastaColors.red("No cell status available")
-        )
-        return 0
-    for cell, cell_status in cells.items():
-        gateway_available: str = cell_status.get("gatewayAvailable")
-        if gateway_available == "True":
-            output.append(
-                indent * tab
-                + f"Cell: {cell} - VTGate: {PaastaColors.green('available')}"
-            )
-        else:
-            output.append(
-                indent * tab
-                + f"Cell: {cell} - VTGate: {PaastaColors.red('unavailable')}"
-            )
-        cell_pending_changes: str = cell_status.get("pendingChanges", None)
-        if cell_pending_changes:
-            output.append(indent * tab + f"  Pending Changes: {cell_pending_changes}")
-    indent -= 1
-
-    output.append(indent * tab + "Vitess Dashboard:")
-    indent += 1
-    vitess_dashboard: VitessDashboardStatus = status.get("vitessDashboard")
-    if not vitess_dashboard:
-        output.append(
-            indent * tab
-            + "Vitess Dashboard: "
-            + PaastaColors.red("No dashboard status available")
-        )
-        return 0
-    vitess_dashboard_available: str = vitess_dashboard.get("available", "")
-    vitess_dashboard_service_name: str = vitess_dashboard.get("serviceName", "")
-    if vitess_dashboard_available == "True":
-        output.append(
-            indent * tab
-            + f"Vitess Dashboard: {vitess_dashboard_service_name} - {PaastaColors.green('available')}"
-        )
-    else:
-        output.append(
-            indent * tab
-            + f"Vitess Dashboard: {vitess_dashboard_service_name} - {PaastaColors.red('unavailable')}"
-        )
-    indent -= 1
-
-    output.append(indent * tab + "VTAdmin:")
-    indent += 1
-    vtadmin: VTAdminStatus = status.get("vtadmin")
-    if not vtadmin:
-        output.append(
-            indent * tab + "VTAdmin: " + PaastaColors.red("No VTAdmin status available")
-        )
-        return 0
-    vtadmin_available: str = vtadmin.get("available", "")
-    vtadmin_service_name: str = vtadmin.get("serviceName", "")
-    if vtadmin_available == "True":
-        output.append(
-            indent * tab
-            + f"VTAdmin: {vtadmin_service_name} - {PaastaColors.green('available')}"
-        )
-    else:
-        output.append(
-            indent * tab
-            + f"VTAdmin: {vtadmin_service_name} - {PaastaColors.red('unavailable')}"
-        )
-    indent -= 1
-
-    output.append(indent * tab + "Keyspaces:")
-    indent += 1
-    keyspaces: Dict[str, VitessClusterKeyspaceStatus] = status.get("keyspaces")
-    if not keyspaces:
-        output.append(
-            indent * tab
-            + "Keyspaces: "
-            + PaastaColors.red("No keyspace status available")
-        )
-        return 0
-    for keyspace, keyspace_status in keyspaces.items():
-        output.append(indent * tab + f"Keyspace: {keyspace}")
-        indent += 1
-        keyspace_pending_changes: str = keyspace_status.get("pendingChanges", None)
-        if keyspace_pending_changes:
-            output.append(
-                indent * tab
-                + f"Keyspace: {keyspace} - Pending Changes: {keyspace_pending_changes}"
-            )
-        keyspace_cells: List[str] = keyspace_status.get("cells", [])
-        output.append(indent * tab + f"  Cells: {', '.join(keyspace_cells)}")
-        desired_shards: int = keyspace_status.get("desiredShards", 0)
-        shards: int = keyspace_status.get("shards", 0)
-        ready_shards: int = keyspace_status.get("readyShards", 0)
-        updated_shards: int = keyspace_status.get("updatedShards", 0)
-        output.append(
-            indent * tab
-            + f"  Shards: {shards} observed, {ready_shards}/{desired_shards} ready, {updated_shards}/{desired_shards} updated"
-        )
-        desired_tablets: int = keyspace_status.get("desiredTablets", 0)
-        tablets: int = keyspace_status.get("tablets", 0)
-        ready_tablets: int = keyspace_status.get("readyTablets", 0)
-        updated_tablets: int = keyspace_status.get("updatedTablets", 0)
-        output.append(
-            indent * tab
-            + f"  Tablets: {tablets} observed, {ready_tablets}/{desired_tablets} ready, {updated_tablets}/{desired_tablets} updated"
-        )
-        indent -= 1
-    indent -= 1
-
-    # This is not needed when not using etcd. We use zk instead
-    global_lockserver: LockServerStatus = status.get("globalLockserver", {})
-    if global_lockserver:
-        output.append(indent * tab + "Global Lockserver:")
-        indent += 1
-        etcd: EtcdLockServerStatus = global_lockserver.get("etcd")
-        if etcd:
-            output.append(indent * tab + "Global Lockserver:")
-            indent += 1
-            observed_generation: int = etcd.get("observedGeneration", 0)
-            available: str = etcd.get("available", "")
-            client_service_name: str = etcd.get("clientServiceName", "")
-            output.append(
-                indent * tab
-                + f"Observed Generation: {observed_generation}, Available: {available}, Client Service Name: {client_service_name}"
-            )
-        indent -= 1
-
-    # Orphaned Cells are not mandatorily seen each time
-    orphaned_cells: Dict[str, OrphanStatus] = status.get("orphanedCells", {})
-    if orphaned_cells:
-        output.append(indent * tab + "Orphaned Cells:")
-        indent += 1
-        for cell, orphan_status in orphaned_cells.items():
-            orphaned_cell_reason: str = orphan_status.get("reason", "")
-            orphaned_cell_message: str = orphan_status.get("message", "")
-            output.append(
-                indent * tab
-                + f"Cell: {cell} - Reason: {orphaned_cell_reason}, Message: {orphaned_cell_message}"
-            )
-        indent -= 1
-
-    # Orphaned Keyspaces are not mandatorily seen each time
-    orphaned_keyspaces: Dict[str, OrphanStatus] = status.get("orphanedKeyspaces", {})
-    if orphaned_keyspaces:
-        output.append(indent * tab + "Orphaned Keyspaces:")
-        indent += 1
-        for keyspace, orphan_status in orphaned_keyspaces.items():
-            orphaned_keyspace_reason: str = orphan_status.get("reason", "")
-            orphaned_keyspace_message: str = orphan_status.get("message", "")
-            output.append(
-                indent * tab
-                + f"Keyspace: {keyspace} - Reason: {orphaned_keyspace_reason}, Message: {orphaned_keyspace_message}"
-            )
-        indent -= 1
-    return 0
-
-
 def report_status_for_cluster(
     service: str,
     cluster: str,
@@ -2548,5 +2299,4 @@ INSTANCE_TYPE_WRITERS: Mapping[str, InstanceStatusWriter] = defaultdict(
     flinkeks=print_flinkeks_status,
     kafkacluster=print_kafka_status,
     cassandracluster=print_cassandra_status,
-    vitesscluster=print_vitess_status,
 )

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/cli/utils.py

@@ -76,7 +76,6 @@ 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.vitesscluster_tools import load_vitess_instance_config
 
 try:
     from vault_tools.paasta_secret import get_client as get_vault_client
@@ -683,9 +682,6 @@ INSTANCE_TYPE_HANDLERS: Mapping[str, InstanceTypeHandler] = defaultdict(
     kafkacluster=InstanceTypeHandler(
         get_service_instance_list, load_kafkacluster_instance_config
     ),
-    vitesscluster=InstanceTypeHandler(
-        get_service_instance_list, load_vitess_instance_config
-    ),
     nrtsearchservice=InstanceTypeHandler(
         get_service_instance_list, load_nrtsearchservice_instance_config
     ),
@@ -716,9 +712,6 @@ LONG_RUNNING_INSTANCE_TYPE_HANDLERS: Mapping[
     kafkacluster=LongRunningInstanceTypeHandler(
         get_service_instance_list, load_kafkacluster_instance_config
     ),
-    vitesscluster=LongRunningInstanceTypeHandler(
-        get_service_instance_list, load_vitess_instance_config
-    ),
     nrtsearchservice=LongRunningInstanceTypeHandler(
         get_service_instance_list, load_nrtsearchservice_instance_config
     ),

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/instance/kubernetes.py

@@ -33,7 +33,6 @@ 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 vitesscluster_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
@@ -56,7 +55,6 @@ INSTANCE_TYPES_CR = {
     "flinkeks",
     "cassandracluster",
     "kafkacluster",
-    "vitesscluster",
 }
 INSTANCE_TYPES_K8S = {
     "cassandracluster",
@@ -71,7 +69,6 @@ INSTANCE_TYPE_CR_ID = dict(
     flinkeks=flink_tools.cr_id,
     cassandracluster=cassandracluster_tools.cr_id,
     kafkacluster=kafkacluster_tools.cr_id,
-    vitesscluster=vitesscluster_tools.cr_id,
     nrtsearchservice=nrtsearchservice_tools.cr_id,
     nrtsearchserviceeks=nrtsearchservice_tools.cr_id,
     monkrelaycluster=monkrelaycluster_tools.cr_id,

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/kubernetes/application/controller_wrappers.py

@@ -4,9 +4,9 @@ from abc import abstractmethod
 from typing import Optional
 from typing import Union
 
-from kubernetes.client import V1beta1PodDisruptionBudget
 from kubernetes.client import V1DeleteOptions
 from kubernetes.client import V1Deployment
+from kubernetes.client import V1PodDisruptionBudget
 from kubernetes.client import V1StatefulSet
 from kubernetes.client.rest import ApiException
 
@@ -168,7 +168,7 @@ class Application(ABC):
 
     def ensure_pod_disruption_budget(
         self, kube_client: KubeClient, namespace: str
-    ) -> V1beta1PodDisruptionBudget:
+    ) -> V1PodDisruptionBudget:
         max_unavailable: Union[str, int]
         if "bounce_margin_factor" in self.soa_config.config_dict:
             max_unavailable = (

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/kubernetes_tools.py

@@ -52,8 +52,6 @@ from kubernetes.client import CoreV1Event
 from kubernetes.client import models
 from kubernetes.client import V1Affinity
 from kubernetes.client import V1AWSElasticBlockStoreVolumeSource
-from kubernetes.client import V1beta1PodDisruptionBudget
-from kubernetes.client import V1beta1PodDisruptionBudgetSpec
 from kubernetes.client import V1Capabilities
 from kubernetes.client import V1ConfigMap
 from kubernetes.client import V1Container
@@ -92,6 +90,8 @@ from kubernetes.client import V1Pod
 from kubernetes.client import V1PodAffinityTerm
 from kubernetes.client import V1PodAntiAffinity
 from kubernetes.client import V1PodCondition
+from kubernetes.client import V1PodDisruptionBudget
+from kubernetes.client import V1PodDisruptionBudgetSpec
 from kubernetes.client import V1PodSecurityContext
 from kubernetes.client import V1PodSpec
 from kubernetes.client import V1PodTemplateSpec
@@ -318,7 +318,7 @@ class DatastoreCredentialsConfig(TypedDict, total=False):
 
 
 def _set_disrupted_pods(self: Any, disrupted_pods: Mapping[str, datetime]) -> None:
-    """Private function used to patch the setter for V1beta1PodDisruptionBudgetStatus.
+    """Private function used to patch the setter for V1PodDisruptionBudgetStatus.
     Can be removed once https://github.com/kubernetes-client/python/issues/466 is resolved
     """
     self._disrupted_pods = disrupted_pods
@@ -582,8 +582,8 @@ class KubeClient:
             context=context,
         )
 
-        models.V1beta1PodDisruptionBudgetStatus.disrupted_pods = property(
-            fget=lambda *args, **kwargs: models.V1beta1PodDisruptionBudgetStatus.disrupted_pods(
+        models.V1PodDisruptionBudgetStatus.disrupted_pods = property(
+            fget=lambda *args, **kwargs: models.V1PodDisruptionBudgetStatus.disrupted_pods(
                 *args, **kwargs
             ),
             fset=_set_disrupted_pods,
@@ -603,7 +603,7 @@ class KubeClient:
 
         self.deployments = kube_client.AppsV1Api(self.api_client)
         self.core = kube_client.CoreV1Api(self.api_client)
-        self.policy = kube_client.PolicyV1beta1Api(self.api_client)
+        self.policy = kube_client.PolicyV1Api(self.api_client)
         self.apiextensions = kube_client.ApiextensionsV1Api(self.api_client)
 
         self.custom = kube_client.CustomObjectsApi(self.api_client)
@@ -3190,13 +3190,13 @@ def pod_disruption_budget_for_service_instance(
     instance: str,
     max_unavailable: Union[str, int],
     namespace: str,
-) -> V1beta1PodDisruptionBudget:
-    return V1beta1PodDisruptionBudget(
+) -> V1PodDisruptionBudget:
+    return V1PodDisruptionBudget(
         metadata=V1ObjectMeta(
             name=get_kubernetes_app_name(service, instance),
             namespace=namespace,
         ),
-        spec=V1beta1PodDisruptionBudgetSpec(
+        spec=V1PodDisruptionBudgetSpec(
             max_unavailable=max_unavailable,
             selector=V1LabelSelector(
                 match_labels={
@@ -3210,7 +3210,7 @@ def pod_disruption_budget_for_service_instance(
 
 def create_pod_disruption_budget(
     kube_client: KubeClient,
-    pod_disruption_budget: V1beta1PodDisruptionBudget,
+    pod_disruption_budget: V1PodDisruptionBudget,
     namespace: str,
 ) -> None:
     return kube_client.policy.create_namespaced_pod_disruption_budget(

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/paastaapi/model/instance_status.py

@@ -38,7 +38,6 @@ def lazy_import():
     from paasta_tools.paastaapi.model.instance_status_kubernetes import InstanceStatusKubernetes
     from paasta_tools.paastaapi.model.instance_status_kubernetes_v2 import InstanceStatusKubernetesV2
     from paasta_tools.paastaapi.model.instance_status_tron import InstanceStatusTron
-    from paasta_tools.paastaapi.model.instance_status_vitesscluster import InstanceStatusVitesscluster
     globals()['InstanceStatusAdhoc'] = InstanceStatusAdhoc
     globals()['InstanceStatusCassandracluster'] = InstanceStatusCassandracluster
     globals()['InstanceStatusFlink'] = InstanceStatusFlink
@@ -46,7 +45,6 @@ def lazy_import():
     globals()['InstanceStatusKubernetes'] = InstanceStatusKubernetes
     globals()['InstanceStatusKubernetesV2'] = InstanceStatusKubernetesV2
     globals()['InstanceStatusTron'] = InstanceStatusTron
-    globals()['InstanceStatusVitesscluster'] = InstanceStatusVitesscluster
 
 
 class InstanceStatus(ModelNormal):
@@ -102,7 +100,6 @@ class InstanceStatus(ModelNormal):
             'version': (str,),  # noqa: E501
             'instance': (str,),  # noqa: E501
             'cassandracluster': (InstanceStatusCassandracluster,),  # noqa: E501
-            'vitesscluster': (InstanceStatusVitesscluster,),  # noqa: E501
             'kafkacluster': (InstanceStatusKafkacluster,),  # noqa: E501
             'kubernetes': (InstanceStatusKubernetes,),  # noqa: E501
             'kubernetes_v2': (InstanceStatusKubernetesV2,),  # noqa: E501
@@ -123,7 +120,6 @@ class InstanceStatus(ModelNormal):
         'version': 'version',  # noqa: E501
         'instance': 'instance',  # noqa: E501
         'cassandracluster': 'cassandracluster',  # noqa: E501
-        'vitesscluster': 'vitesscluster',  # noqa: E501
         'kafkacluster': 'kafkacluster',  # noqa: E501
         'kubernetes': 'kubernetes',  # noqa: E501
         'kubernetes_v2': 'kubernetes_v2',  # noqa: E501
@@ -184,7 +180,6 @@ class InstanceStatus(ModelNormal):
             version (str): Deployment Version of a service. [optional]  # noqa: E501
             instance (str): Instance name. [optional]  # noqa: E501
             cassandracluster (InstanceStatusCassandracluster): [optional]  # noqa: E501
-            vitesscluster (InstanceStatusVitesscluster): [optional]  # noqa: E501
             kafkacluster (InstanceStatusKafkacluster): [optional]  # noqa: E501
             kubernetes (InstanceStatusKubernetes): [optional]  # noqa: E501
             kubernetes_v2 (InstanceStatusKubernetesV2): [optional]  # noqa: E501

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/paastaapi/models/__init__.py

@@ -39,7 +39,6 @@ from paasta_tools.paastaapi.model.instance_status_kubernetes import InstanceStat
 from paasta_tools.paastaapi.model.instance_status_kubernetes_autoscaling_status import InstanceStatusKubernetesAutoscalingStatus
 from paasta_tools.paastaapi.model.instance_status_kubernetes_v2 import InstanceStatusKubernetesV2
 from paasta_tools.paastaapi.model.instance_status_tron import InstanceStatusTron
-from paasta_tools.paastaapi.model.instance_status_vitesscluster import InstanceStatusVitesscluster
 from paasta_tools.paastaapi.model.instance_tasks import InstanceTasks
 from paasta_tools.paastaapi.model.integer_and_error import IntegerAndError
 from paasta_tools.paastaapi.model.kubernetes_container import KubernetesContainer

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools/setup_kubernetes_cr.py

@@ -49,15 +49,11 @@ 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."""
@@ -355,13 +351,6 @@ 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.8.2 → paasta-tools-1.10.0}/paasta_tools/utils.py

@@ -136,7 +136,6 @@ INSTANCE_TYPES = (
     "flinkeks",
     "cassandracluster",
     "kafkacluster",
-    "vitesscluster",
     "monkrelays",
     "nrtsearchservice",
     "nrtsearchserviceeks",
@@ -155,7 +154,6 @@ INSTANCE_TYPE_TO_K8S_NAMESPACE = {
     "flinkeks": "paasta-flinks",
     "cassandracluster": "paasta-cassandraclusters",
     "kafkacluster": "paasta-kafkaclusters",
-    "vitesscluster": "paasta-vitessclusters",
     "nrtsearchservice": "paasta-nrtsearchservices",
     "nrtsearchserviceeks": "paasta-nrtsearchservices",
 }
@@ -2046,11 +2044,6 @@ class SystemPaastaConfigDict(TypedDict, total=False):
     service_auth_vault_role: str
     service_auth_sso_oidc_client_id: str
     always_authenticating_services: List[str]
-    vitess_images: Dict
-    superregion_to_region_mapping: Dict
-    vitess_tablet_types: List[str]
-    vitess_tablet_pool_type_mapping: Dict
-    vitess_throttling_config: Dict
     uses_bulkdata_default: bool
     enable_automated_redeploys_default: bool
     enable_tron_tsc: bool
@@ -2773,49 +2766,6 @@ class SystemPaastaConfig:
     def get_always_authenticating_services(self) -> List[str]:
         return self.config_dict.get("always_authenticating_services", [])
 
-    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 get_uses_bulkdata_default(self) -> bool:
         return self.config_dict.get("uses_bulkdata_default", True)
 

{paasta-tools-1.8.2 → paasta-tools-1.10.0/paasta_tools.egg-info}/PKG-INFO

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

{paasta-tools-1.8.2 → paasta-tools-1.10.0}/paasta_tools.egg-info/SOURCES.txt

@@ -87,7 +87,6 @@ paasta_tools/spark_tools.py
 paasta_tools/synapse_srv_namespaces_fact.py
 paasta_tools/tron_tools.py
 paasta_tools/utils.py
-paasta_tools/vitesscluster_tools.py
 paasta_tools.egg-info/PKG-INFO
 paasta_tools.egg-info/SOURCES.txt
 paasta_tools.egg-info/dependency_links.txt
@@ -266,7 +265,6 @@ paasta_tools/paastaapi/model/instance_status_kubernetes.py
 paasta_tools/paastaapi/model/instance_status_kubernetes_autoscaling_status.py
 paasta_tools/paastaapi/model/instance_status_kubernetes_v2.py
 paasta_tools/paastaapi/model/instance_status_tron.py
-paasta_tools/paastaapi/model/instance_status_vitesscluster.py
 paasta_tools/paastaapi/model/instance_tasks.py
 paasta_tools/paastaapi/model/integer_and_error.py
 paasta_tools/paastaapi/model/kubernetes_container.py