github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57458 from juju-solutions/bug/evicted

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Evicted pods should not be marked as failing since they respawn

**What this PR does / why we need it**: Juju deployments should not report evicted pods as failing.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```NONE

```
This commit is contained in:
Kubernetes Submit Queue 2017-12-20 11:42:33 -08:00 committed by GitHub
commit 8d309aa04c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@ -1241,7 +1241,9 @@ def all_kube_system_pods_running():
result = json.loads(output) result = json.loads(output)
for pod in result['items']: for pod in result['items']:
status = pod['status']['phase'] status = pod['status']['phase']
if status != 'Running': # Evicted nodes should re-spawn
if status != 'Running' and \
pod['status'].get('reason', '') != 'Evicted':
return False return False
return True return True