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

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 ```

Merge pull request #57458 from juju-solutions/bug/evicted
8d309aa0 · Kubernetes Submit Queue · GitHub · 3d652cae · bd8eaa7f · 8d309aa0
Unverified Commit 8d309aa0 authored Dec 20, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

kubernetes_master.py ...ju/layers/kubernetes-master/reactive/kubernetes_master.py +3 -1

No files found.
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -1241,7 +1241,9 @@ def all_kube_system_pods_running():
    result = json.loads(output)
    for pod in result['items']:
        status = pod['status']['phase']
-        if status != 'Running':
+        # Evicted nodes should re-spawn
+        if status != 'Running' and \
+           pod['status'].get('reason', '') != 'Evicted':
            return False
    return True