paasta-tools 1.9.0__tar.gz → 1.11.0__tar.gz

{paasta-tools-1.9.0/paasta_tools.egg-info → paasta-tools-1.11.0}/PKG-INFO

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

{paasta-tools-1.9.0 → paasta-tools-1.11.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.9.0"
+__version__ = "1.11.0"

{paasta-tools-1.9.0 → paasta-tools-1.11.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.9.0 → paasta-tools-1.11.0}/paasta_tools/cli/cli.py

@@ -110,6 +110,7 @@ PAASTA_SUBCOMMANDS = {
     "itest": "itest",
     "list-clusters": "list_clusters",
     "list-deploy-queue": "list_deploy_queue",
+    "list-namespaces": "list_namespaces",
     "list": "list",
     "local-run": "local_run",
     "logs": "logs",

{paasta-tools-1.9.0 → paasta-tools-1.11.0}/paasta_tools/cli/cmds/autoscale.py

@@ -39,18 +39,20 @@ def add_subparser(subparsers):
     )
 
     autoscale_parser.add_argument(
-        "-s", "--service", help="Service that you want to stop. Like 'example_service'."
+        "-s",
+        "--service",
+        help="Service that you want to autoscale. Like 'example_service'.",
     ).completer = lazy_choices_completer(list_services)
     autoscale_parser.add_argument(
         "-i",
         "--instance",
-        help="Instance of the service that you want to stop. Like 'main' or 'canary'.",
+        help="Instance of the service that you want to autoscale. Like 'main' or 'canary'.",
         required=True,
     ).completer = lazy_choices_completer(list_instances)
     autoscale_parser.add_argument(
         "-c",
         "--cluster",
-        help="The PaaSTA cluster that has the service instance you want to stop. Like 'pnw-prod'.",
+        help="The PaaSTA cluster that has the service instance you want to autoscale. Like 'pnw-prod'.",
         required=True,
     ).completer = lazy_choices_completer(list_clusters)
     autoscale_parser.add_argument(

paasta-tools-1.11.0/paasta_tools/cli/cmds/list_namespaces.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# Copyright 2015-2016 Yelp Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from paasta_tools.cli.utils import get_instance_configs_for_service
+from paasta_tools.cli.utils import lazy_choices_completer
+from paasta_tools.cli.utils import validate_service_name
+from paasta_tools.spark_tools import SPARK_EXECUTOR_NAMESPACE
+from paasta_tools.utils import DEFAULT_SOA_DIR
+from paasta_tools.utils import list_clusters
+from paasta_tools.utils import list_services
+
+
+def add_subparser(subparsers) -> None:
+    list_parser = subparsers.add_parser(
+        "list-namespaces",
+        help="Lists all k8s namespaces used by instances of a service",
+    )
+    list_parser.add_argument(
+        "-s",
+        "--service",
+        help="Name of the service which you want to list the namespaces for.",
+        required=True,
+    ).completer = lazy_choices_completer(list_services)
+    # Most services likely don't need to filter by cluster/instance, and can add namespaces from all instances
+    list_parser.add_argument(
+        "-i",
+        "--instance",
+        help="Instance of the service that you want to list namespaces for. Like 'main' or 'canary'.",
+        required=False,
+    )
+    list_parser.add_argument(
+        "-c",
+        "--cluster",
+        help="Clusters that you want to list namespaces for. Like 'pnw-prod' or 'norcal-stagef'.",
+        required=False,
+    ).completer = lazy_choices_completer(list_clusters)
+    list_parser.add_argument(
+        "-y",
+        "-d",
+        "--soa-dir",
+        dest="soa_dir",
+        default=DEFAULT_SOA_DIR,
+        required=False,
+        help="define a different soa config directory",
+    )
+    list_parser.set_defaults(command=paasta_list_namespaces)
+
+
+def paasta_list_namespaces(args):
+    service = args.service
+    soa_dir = args.soa_dir
+    validate_service_name(service, soa_dir)
+
+    namespaces = set()
+    instance_configs = get_instance_configs_for_service(
+        service=service, soa_dir=soa_dir, instances=args.instance, clusters=args.cluster
+    )
+    for instance in instance_configs:
+        # We skip non-k8s instance types
+        if instance.get_instance_type() in ("paasta-native", "adhoc"):
+            continue
+        namespaces.add(instance.get_namespace())
+        # Tron instances are TronActionConfigs
+        if (
+            instance.get_instance_type() == "tron"
+            and instance.get_executor() == "spark"
+        ):
+            # We also need paasta-spark for spark executors
+            namespaces.add(SPARK_EXECUTOR_NAMESPACE)
+
+    # Print in list format to be used in iam_roles
+    print(list(namespaces))
+    return 0

{paasta-tools-1.9.0 → paasta-tools-1.11.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.9.0 → paasta-tools-1.11.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.9.0 → paasta-tools-1.11.0}/paasta_tools/contrib/service_shard_update.py

@@ -164,6 +164,13 @@ def parse_args():
         type=int,
         dest="autotune_max_disk",
     )
+    parser.add_argument(
+        "--iam-role",
+        help="IAM role to use for the shard",
+        required=False,
+        type=str,
+        dest="iam_role",
+    )
     return parser.parse_args()
 
 
@@ -264,6 +271,8 @@ def main(args):
                             metrics_provider_config
                         )
 
+                    if args.iam_role is not None:
+                        instance_config["iam_role"] = args.iam_role
                     if args.cpus is not None:
                         instance_config["cpus"] = args.cpus
                     if args.mem is not None:
@@ -306,6 +315,7 @@ def main(args):
                     # Add the missing definition and write to the corresponding config
                     if args.shard_name not in config_file.keys():
                         config_file[args.shard_name] = instance_config
+
                         updater.write_configs(
                             args.service, f"{config_prefix}{config_path}", config_file
                         )

{paasta-tools-1.9.0 → paasta-tools-1.11.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.9.0 → paasta-tools-1.11.0}/paasta_tools/long_running_service_tools.py

@@ -149,10 +149,6 @@ class LongRunningServiceConfig(InstanceConfig):
     def get_bounce_method(self) -> str:
         raise NotImplementedError
 
-    def get_namespace(self) -> str:
-        """Get namespace from config"""
-        raise NotImplementedError
-
     def get_kubernetes_namespace(self) -> str:
         """
         Only needed on kubernetes LongRunningServiceConfig

{paasta-tools-1.9.0 → paasta-tools-1.11.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.9.0 → paasta-tools-1.11.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.9.0 → paasta-tools-1.11.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,