Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/xpk/commands/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,14 @@
from ..utils.console import get_user_input, xpk_exit, xpk_print
from ..utils.kubectl import apply_kubectl_manifest
from ..utils.execution_context import is_dry_run
from ..utils.validation import validate_dependencies, should_validate_dependencies
from ..utils.validation import validate_dependencies_list, SystemDependency, should_validate_dependencies


def storage_create(args: Namespace) -> None:
if should_validate_dependencies(args):
validate_dependencies()
validate_dependencies_list(
[SystemDependency.KUBECTL, SystemDependency.GCLOUD]
)
add_zone_and_project(args)
if args.type == GCP_FILESTORE_TYPE:
if args.instance is None:
Expand Down Expand Up @@ -111,7 +113,9 @@ def storage_create(args: Namespace) -> None:

def storage_delete(args: Namespace) -> None:
if should_validate_dependencies(args):
validate_dependencies()
validate_dependencies_list(
[SystemDependency.KUBECTL, SystemDependency.GCLOUD]
)
add_zone_and_project(args)
k8s_api_client = setup_k8s_env(args)
storages = list_storages(k8s_api_client)
Expand Down Expand Up @@ -147,7 +151,9 @@ def storage_delete(args: Namespace) -> None:

def storage_attach(args: Namespace) -> None:
if should_validate_dependencies(args):
validate_dependencies()
validate_dependencies_list(
[SystemDependency.KUBECTL, SystemDependency.GCLOUD]
)
add_zone_and_project(args)
manifest: list[dict] = [{}]
if args.type == GCP_FILESTORE_TYPE:
Expand Down Expand Up @@ -252,7 +258,9 @@ def enable_csi_drivers_if_necessary(args: Namespace) -> None:

def storage_list(args: Namespace) -> None:
if should_validate_dependencies(args):
validate_dependencies()
validate_dependencies_list(
[SystemDependency.KUBECTL, SystemDependency.GCLOUD]
)
storages = []
if not is_dry_run():
k8s_api_client = setup_k8s_env(args)
Expand All @@ -262,7 +270,9 @@ def storage_list(args: Namespace) -> None:

def storage_detach(args: Namespace) -> None:
if should_validate_dependencies(args):
validate_dependencies()
validate_dependencies_list(
[SystemDependency.KUBECTL, SystemDependency.GCLOUD]
)
k8s_api_client = setup_k8s_env(args)
storage = get_storage(k8s_api_client, args.name)
delete_storage_resources(k8s_api_client, storage)
Expand Down
Loading