Skip to content

Terminate pod return value #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Terminate pod return value #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20b164
Merge pull request #1 from chaostoolkit/master
hendrikKahl Apr 21, 2020
73e1899
terminate_pods returns nanes of deleted pods
hendrikKahl Apr 21, 2020
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
4 changes: 4 additions & 0 deletions chaosk8s/pod/actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ def terminate_pods(label_selector: str = None, name_pattern: str = None,
if grace_period >= 0:
body = client.V1DeleteOptions(grace_period_seconds=grace_period)

deleted_pods = []
for p in pods:
v1.delete_namespaced_pod(p.metadata.name, ns, body=body)
deleted_pods.append(p.metadata.name)

return deleted_pods


def exec_in_pods(cmd: str,
Expand Down
42 changes: 31 additions & 11 deletions tests/test_pod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ def test_terminate_pods_by_name_pattern(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(name_pattern="my-app-[0-9]$")

ret = terminate_pods(name_pattern="my-app-[0-9]$")

assert len(ret) == 1
assert ret == [pod.metadata.name]
assert v1.delete_namespaced_pod.call_count == 1
v1.delete_namespaced_pod.assert_called_with(
pod.metadata.name, "default", body=ANY)
Expand All @@ -57,8 +59,10 @@ def test_terminate_pods_by_name_pattern_all(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(name_pattern="my-app-[0-9]$", all=True)
ret = terminate_pods(name_pattern="my-app-[0-9]$", all=True)

assert len(ret) == 2
assert ret == [pod1.metadata.name, pod2.metadata.name]
assert v1.delete_namespaced_pod.call_count == 2
calls = [call(pod1.metadata.name, "default", body=ANY),
call(pod2.metadata.name, "default", body=ANY)]
Expand Down Expand Up @@ -91,8 +95,10 @@ def test_terminate_pods_by_name_pattern_rand(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(name_pattern="my-app-[0-9]$", rand=True)
ret = terminate_pods(name_pattern="my-app-[0-9]$", rand=True)

assert len(ret) == 1
assert ret == [pod3.metadata.name]
assert v1.delete_namespaced_pod.call_count == 1
v1.delete_namespaced_pod.assert_called_with(
pod3.metadata.name, "default", body=ANY)
Expand All @@ -116,8 +122,10 @@ def test_terminate_pods_all(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(all=True)
ret = terminate_pods(all=True)

assert len(ret) == 2
assert ret == [pod1.metadata.name, pod2.metadata.name]
assert v1.delete_namespaced_pod.call_count == 2
calls = [call(pod1.metadata.name, "default", body=ANY),
call(pod2.metadata.name, "default", body=ANY)]
Expand All @@ -144,8 +152,10 @@ def test_terminate_pods_rand(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(rand=True)
ret = terminate_pods(rand=True)

assert len(ret) == 1
assert ret == [pod2.metadata.name]
assert v1.delete_namespaced_pod.call_count == 1
v1.delete_namespaced_pod.assert_called_with(
pod2.metadata.name, "default", body=ANY)
Expand All @@ -169,8 +179,10 @@ def test_terminate_pods_when_no_params_given(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods()
ret = terminate_pods()

assert len(ret) == 1
assert ret == [pod1.metadata.name]
assert v1.delete_namespaced_pod.call_count == 1
v1.delete_namespaced_pod.assert_called_with(
pod1.metadata.name, "default", body=ANY)
Expand All @@ -191,8 +203,10 @@ def test_terminate_pods_when_grace_period_is_set(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(grace_period=5)
ret = terminate_pods(grace_period=5)

assert len(ret) == 1
assert ret == [pod1.metadata.name]
assert v1.delete_namespaced_pod.call_count == 1
v1.delete_namespaced_pod.assert_called_with(
pod1.metadata.name, "default",
Expand Down Expand Up @@ -223,8 +237,10 @@ def test_terminate_pods_by_given_percentage(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(mode='percentage', qty=40)
ret = terminate_pods(mode='percentage', qty=40)

assert len(ret) == 2
assert ret == [pod1.metadata.name, pod2.metadata.name]
assert v1.delete_namespaced_pod.call_count == 2
calls = [call(pod1.metadata.name, "default", body=ANY),
call(pod2.metadata.name, "default", body=ANY)]
Expand Down Expand Up @@ -257,8 +273,10 @@ def test_terminate_pods_by_given_percentage_rand(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(mode='percentage', qty=40, rand=True)
ret = terminate_pods(mode='percentage', qty=40, rand=True)

assert len(ret) == 2
assert ret == [pod3.metadata.name, pod4.metadata.name]
assert v1.delete_namespaced_pod.call_count == 2
calls = [call(pod3.metadata.name, "default", body=ANY),
call(pod4.metadata.name, "default", body=ANY)]
Expand All @@ -283,8 +301,10 @@ def test_terminate_pods_when_qty_grt_than_pods_selected(cl, client, has_conf):
v1.list_namespaced_pod.return_value = result
client.CoreV1Api.return_value = v1

terminate_pods(qty=40)
ret = terminate_pods(qty=40)

assert len(ret) == 2
assert ret == [pod1.metadata.name, pod2.metadata.name]
assert v1.delete_namespaced_pod.call_count == 2
calls = [call(pod1.metadata.name, "default", body=ANY),
call(pod2.metadata.name, "default", body=ANY)]
Expand Down