airship
/
armada
Code Issues Proposed changes

Merge "Fixing Armada waits for Evicted pods undefinetly"

This commit is contained in:
Zuul 2021-03-23 13:22:14 +00:00 committed by Gerrit Code Review
parent 240039e064 1e5d781fe9
commit 7ef4b8643b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
armada/handlers/wait.py
View File

@ -486,6 +486,9 @@ class PodWait(ResourceWait):
if is_test_pod(pod):
return 'helm test pod'
if pod.status.phase == 'Evicted':
return "pod was evicted"
schema_info = get_schema_info(self.chart_wait.chart['schema'])
# TODO: Remove when v1 doc support is removed.
if schema_info.version < 2:

13
armada/tests/unit/handlers/test_wait.py
View File

@ -218,7 +218,7 @@ class PodWaitTestCase(base.ArmadaTestCase):
'helm.sh/hook': 'test-success'
}),
mock_resource({'helm.sh/hook': 'test-failure'}),
mock_resource({'helm.sh/hook': 'test-success,pre-install'})
mock_resource({'helm.sh/hook': 'test-success,pre-install'}),
]
job_pods = [
mock_resource(owner_references=[mock.Mock(kind='Job')]),
@ -233,7 +233,12 @@ class PodWaitTestCase(base.ArmadaTestCase):
mock_resource(owner_references=[]),
mock_resource({'helm.sh/hook': 'pre-install'}),
mock_resource({'key': 'value'}),
mock_resource(owner_references=[mock.Mock(kind='NotAJob')])
mock_resource(owner_references=[mock.Mock(kind='NotAJob')]),
]
evicted_pods = [
mock.Mock(
metadata=mock.Mock(annotations={}, owner_references=None),
status=mock.Mock(phase='Evicted')),
]
unit = self.get_unit({}, version=1)
@ -250,6 +255,10 @@ class PodWaitTestCase(base.ArmadaTestCase):
for pod in included_pods:
self.assertTrue(unit.include_resource(pod))
# Validate evicted pods are excluded
for pod in evicted_pods:
self.assertFalse(unit.include_resource(pod))
class JobWaitTestCase(base.ArmadaTestCase):
def get_unit(self, labels):