Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Commit fcb60ab

Browse files
committed
Fix remaining issues
1 parent 332d9a4 commit fcb60ab

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/cluster/kind.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async def create_kind_cluster(
6464

6565
if cluster_exists:
6666
if not force_recreate:
67-
raise RuntimeError(f"Kind cluster '{cluster_name}' already exists.")
67+
raise ClusterAlreadyExistsError(cluster_name, "kind")
6868
else:
6969
if not await delete_kind_cluster(kind, cluster_name):
7070
return False

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/cluster/kind_test.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
kind_cluster_exists,
1111
kind_installed,
1212
)
13+
from jumpstarter_kubernetes.exceptions import ClusterAlreadyExistsError
1314

1415

1516
class TestKindInstalled:
@@ -131,9 +132,12 @@ async def test_create_kind_cluster_already_exists(self, mock_cluster_exists, moc
131132
mock_kind_installed.return_value = True
132133
mock_cluster_exists.return_value = True
133134

134-
with pytest.raises(RuntimeError, match="Kind cluster 'test-cluster' already exists"):
135+
with pytest.raises(ClusterAlreadyExistsError) as exc_info:
135136
await create_kind_cluster("kind", "test-cluster")
136137

138+
assert exc_info.value.cluster_name == "test-cluster"
139+
assert exc_info.value.cluster_type == "kind"
140+
137141
@pytest.mark.asyncio
138142
@patch("jumpstarter_kubernetes.cluster.kind.kind_installed")
139143
@patch("jumpstarter_kubernetes.cluster.kind.kind_cluster_exists")

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/cluster/operations.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ async def create_cluster_and_install(
154154
await create_minikube_cluster_with_options(
155155
minikube, cluster_name, minikube_extra_args, force_recreate_cluster, extra_certs, callback
156156
)
157+
else:
158+
raise ClusterTypeValidationError(f"Unsupported cluster_type: {cluster_type}")
157159

158160
# Install Jumpstarter if requested
159161
if install_jumpstarter:

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/cluster/operations_test.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,11 @@ async def test_create_cluster_and_install_no_version(self, mock_configure, mock_
170170

171171
with pytest.raises(ClusterOperationError):
172172
await create_cluster_and_install("kind", False, "test-cluster", "", "", "kind", "minikube")
173+
174+
@pytest.mark.asyncio
175+
async def test_create_cluster_and_install_unsupported_cluster_type(self):
176+
"""Test that creating a cluster with an unsupported cluster type raises ClusterTypeValidationError."""
177+
with pytest.raises(ClusterTypeValidationError) as exc_info:
178+
await create_cluster_and_install("remote", False, "test-cluster", "", "", "kind", "minikube")
179+
180+
assert "Unsupported cluster_type: remote" in str(exc_info.value)

0 commit comments

Comments
 (0)