Merge pull request #3947 from Yelp/u/gonabavi/revert_to_a_single_vite…

…sscluster U/gonabavi/revert to a single vitesscluster
Yelp · Sep 4, 2024 · 84c4cb7 · 84c4cb7
2 parents 283ec1c + 6b2cb08
commit 84c4cb7
Show file tree

Hide file tree

Showing 10 changed files with 974 additions and 962 deletions.
diff --git a/paasta_tools/cli/cmds/status.py b/paasta_tools/cli/cmds/status.py
@@ -95,18 +95,14 @@
 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 @@
     FlinkDeploymentConfig,
     FlinkEksDeploymentConfig,
     CassandraClusterDeploymentConfig,
-    VitessClusterConfig,
-    VitessCellConfig,
-    VitessKeyspaceConfig,
+    VitessDeploymentConfig,
     KafkaClusterDeploymentConfig,
     KubernetesDeploymentConfig,
     EksDeploymentConfig,
@@ -143,9 +137,7 @@
 EKS_DEPLOYMENT_CONFIGS = [
     EksDeploymentConfig,
     FlinkEksDeploymentConfig,
-    VitessClusterConfig,
-    VitessCellConfig,
-    VitessKeyspaceConfig,
+    VitessDeploymentConfig,
 ]
 FLINK_DEPLOYMENT_CONFIGS = [FlinkDeploymentConfig, FlinkEksDeploymentConfig]
 

diff --git a/paasta_tools/cli/utils.py b/paasta_tools/cli/utils.py
@@ -76,9 +76,7 @@
 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 @@ class LongRunningInstanceTypeHandler(NamedTuple):
         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 @@ class LongRunningInstanceTypeHandler(NamedTuple):
         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

diff --git a/paasta_tools/instance/kubernetes.py b/paasta_tools/instance/kubernetes.py
@@ -33,9 +33,7 @@
 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 @@
     "cassandracluster",
     "kafkacluster",
     "vitesscluster",
-    "vitesscell",
-    "vitesskeyspace",
 }
 INSTANCE_TYPES_K8S = {
     "cassandracluster",
@@ -76,8 +72,6 @@
     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,

diff --git a/paasta_tools/setup_kubernetes_cr.py b/paasta_tools/setup_kubernetes_cr.py
@@ -49,19 +49,13 @@
 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:

diff --git a/paasta_tools/utils.py b/paasta_tools/utils.py
@@ -137,8 +137,6 @@
     "cassandracluster",
     "kafkacluster",
     "vitesscluster",
-    "vitesscell",
-    "vitesskeyspace",
     "monkrelays",
     "nrtsearchservice",
     "nrtsearchserviceeks",
@@ -158,8 +156,6 @@
     "cassandracluster": "paasta-cassandraclusters",
     "kafkacluster": "paasta-kafkaclusters",
     "vitesscluster": "paasta-vitessclusters",
-    "vitesscell": "paasta-vitessclusters",
-    "vitesskeyspace": "paasta-vitessclusters",
     "nrtsearchservice": "paasta-nrtsearchservices",
     "nrtsearchserviceeks": "paasta-nrtsearchservices",
 }