Deduplicate cluster creation

Author: johannes-graner

codehub/cli/create.py

@@ -20,11 +20,11 @@
 from codehub.cli.helm.create import create_deploy
 from codehub.cli.helm.install import install_helm_chart
 from codehub.cli.helpers import get_cloud_dir, get_latest_deployment, read_yaml
-from codehub.cli.manage import wait_for_hub_to_get_ready, get_ip
+from codehub.cli.manage import wait_for_hub_to_get_ready
 import kubernetes.client.rest  # Add this import for the exception handling
 
 
-def create_infrastructure(config: CreateConfig):
+def create_infrastructure(config: CreateConfig) -> DeployConfig:
     helm_dir, hub_dir, k8s_dir, cloud_dir = __create_deploy_structure(config.name)
 
     setup_terraform(
@@ -38,31 +38,21 @@ def create_infrastructure(config: CreateConfig):
     )
     __create_k8s_resources(deploy_config)
 
-    return get_ip(config.name, k8s_dir)
+    return deploy_config
 
 
-def create(config: CreateConfig):
-    helm_dir, hub_dir, k8s_dir, cloud_dir = __create_deploy_structure(config.name)
-
-    setup_terraform(
-        config=config,
-        cloud_dir=cloud_dir,
-    )
-
-    cloud_state = terraform_apply(cloud_dir=cloud_dir)
-    deploy_config = DeployConfig(
-        config.name, config.region, helm_dir, hub_dir, k8s_dir, cloud_state
-    )
+def create(config: CreateConfig) -> DeployConfig:
+    deploy_config = create_infrastructure(config)
     hub_config = HubConfig(config.admins)
 
     __create_k8s_resources(deploy_config)
 
     __create_deploy(deploy_config, hub_config)
     install_helm_chart(deploy_config, upgrade=False)
 
-    wait_for_hub_to_get_ready(k8s_dir)
+    wait_for_hub_to_get_ready(deploy_config.k8s_dir)
 
-    return get_ip(config.name, k8s_dir)
+    return deploy_config
 
 
 def upgrade(config: UpgradeConfig):

codehub/cli/entrypoint.py

@@ -42,7 +42,8 @@ def createcluster(name, admin, region, zone, machine_type):
     admins = [user.lower() for user in admin]
     config = CreateConfig(name, admins, region, zone, machine_type)
 
-    res = create(config)
+    deploy_config = create(config)
+    res = get_ip(name, deploy_config.k8s_dir)
 
     logger.debug(f"{create.__module__}.{create.__name__} output:")
     logger.debug(res)
@@ -152,7 +153,8 @@ def createclusterinfra(name, region, zone, machine_type):
     admins = []
     config = CreateConfig(name, admins, region, zone, machine_type)
 
-    res = create_infrastructure(config)
+    deploy_config = create_infrastructure(config)
+    res = get_ip(name, deploy_config.k8s_dir)
 
     logger.debug(f"{create.__module__}.{create.__name__} output:")
     logger.debug(res)