Merge pull request #1223 from spadgett/evicted-pods

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/overview.js

@@ -260,10 +260,10 @@ angular.module('openshiftConsole')
 
     // Filter out monopods we know we don't want to see
     var showMonopod = function(pod) {
-      // Hide pods in the Succeeded & Terminated phases since these
+      // Hide pods in the Succeeded & Failed phases since these
       // are run once pods that are done.
       if (pod.status.phase === 'Succeeded' ||
-          pod.status.phase === 'Terminated') {
+          pod.status.phase === 'Failed') {
         // TODO we may want to show pods for X amount of time after they have completed
         return false;
       }

app/scripts/directives/podDonut.js

@@ -2,7 +2,6 @@
 
 angular.module('openshiftConsole')
   .directive('podDonut', function($timeout,
-                                  hashSizeFilter,
                                   isPullingImageFilter,
                                   isTerminatingFilter,
                                   podWarningsFilter,
@@ -24,13 +23,15 @@ angular.module('openshiftConsole')
         var chart, config;
 
         // The phases to show (in order).
-        var phases = ["Running", "Not Ready", "Warning", "Failed", "Pulling", "Pending", "Succeeded", "Terminating", "Unknown"];
+        var phases = ["Running", "Not Ready", "Warning", "Error", "Pulling", "Pending", "Succeeded", "Terminating", "Unknown"];
 
         $scope.chartId = _.uniqueId('pods-donut-chart-');
 
         function updateCenterText() {
-          var total = hashSizeFilter($scope.pods);
           var smallText;
+          // Don't show failed pods like evicted pods in the donut.
+          var pods = _.reject($scope.pods, { status: { phase: 'Failed' } });
+          var total = _.size(pods);
           if (!angular.isNumber($scope.desired) || $scope.desired === total) {
             smallText = (total === 1) ? "pod" : "pods";
           } else {
@@ -75,7 +76,7 @@ angular.module('openshiftConsole')
 
                 // Disable the tooltip for empty donuts.
                 if (id === "Empty") {
-                  return "No pods exist";
+                  return undefined;
                 }
 
                 // Show the count rather than a percentage.
@@ -98,7 +99,7 @@ angular.module('openshiftConsole')
               "Not Ready": "#beedf9",
               // Use a shade of orange that looks good with overview alerts for warning pods.
               Warning: "#f39d3c",
-              Failed: "#d9534f",
+              Error: "#d9534f",
               Pulling: "#d1d1d1",
               Pending: "#ededed",
               Succeeded: "#3f9c35",
@@ -119,7 +120,7 @@ angular.module('openshiftConsole')
             data.columns.push([phase, countByPhase[phase] || 0]);
           });
 
-          if (hashSizeFilter(countByPhase) === 0) {
+          if (_.isEmpty(countByPhase)) {
             // Add a dummy group to draw an arc, which we style in CSS.
             data.columns.push(["Empty", 1]);
           } else {
@@ -152,7 +153,7 @@ angular.module('openshiftConsole')
 
           var warnings = podWarningsFilter(pod);
           if (_.some(warnings, { severity: 'error' })) {
-            return 'Failed';
+            return 'Error';
           } else if (!_.isEmpty(warnings)) {
             return 'Warning';
           }

dist/scripts/scripts.js

@@ -4648,7 +4648,7 @@ var b = a.spec.scaleRef.name, c = a.spec.scaleRef.kind;
 b && c && (_.has(C, [ c, b ]) || _.set(C, [ c, b ], []), C[c][b].push(a));
 });
 }, $ = function(a) {
-return "Succeeded" !== a.status.phase && "Terminated" !== a.status.phase && (!G(a, "openshift.io/deployer-pod-for.name") && (!F(a, "openshift.io/build.name") && "slave" !== G(a, "jenkins")));
+return "Succeeded" !== a.status.phase && "Failed" !== a.status.phase && (!G(a, "openshift.io/deployer-pod-for.name") && (!F(a, "openshift.io/build.name") && "slave" !== G(a, "jenkins")));
 }, aa = function() {
 if (y && u && w && x) {
 var a = _.toArray(u).concat(_.toArray(w)).concat(_.toArray(x));
@@ -12288,7 +12288,7 @@ msg:"@"
 },
 templateUrl:"views/directives/_ellipsis-pulser.html"
 };
-} ]), angular.module("openshiftConsole").directive("podDonut", [ "$timeout", "hashSizeFilter", "isPullingImageFilter", "isTerminatingFilter", "podWarningsFilter", "numContainersReadyFilter", "Logger", "ChartsService", function(a, b, c, d, e, f, g, h) {
+} ]), angular.module("openshiftConsole").directive("podDonut", [ "$timeout", "isPullingImageFilter", "isTerminatingFilter", "podWarningsFilter", "numContainersReadyFilter", "Logger", "ChartsService", function(a, b, c, d, e, f, g) {
 return {
 restrict:"E",
 scope:{
@@ -12297,39 +12297,43 @@ desired:"=?",
 idled:"=?"
 },
 templateUrl:"views/directives/pod-donut.html",
-link:function(a, g) {
-function i() {
-var c, d = b(a.pods);
-c = angular.isNumber(a.desired) && a.desired !== d ? "scaling to " + a.desired + "..." :1 === d ? "pod" :"pods", a.idled ? h.updateDonutCenterText(g[0], "Idle") :h.updateDonutCenterText(g[0], d, c);
+link:function(a, f) {
+function h() {
+var b, c = _.reject(a.pods, {
+status:{
+phase:"Failed"
 }
-function j(c) {
-var d = {
+}), d = _.size(c);
+b = angular.isNumber(a.desired) && a.desired !== d ? "scaling to " + a.desired + "..." :1 === d ? "pod" :"pods", a.idled ? g.updateDonutCenterText(f[0], "Idle") :g.updateDonutCenterText(f[0], d, b);
+}
+function i(b) {
+var c = {
 columns:[]
 };
-angular.forEach(p, function(a) {
-d.columns.push([ a, c[a] || 0 ]);
-}), 0 === b(c) ? d.columns.push([ "Empty", 1 ]) :d.unload = "Empty", n ? n.load(d) :(o.data.columns = d.columns, n = c3.generate(o)), a.podStatusData = d.columns;
+angular.forEach(o, function(a) {
+c.columns.push([ a, b[a] || 0 ]);
+}), _.isEmpty(b) ? c.columns.push([ "Empty", 1 ]) :c.unload = "Empty", m ? m.load(c) :(n.data.columns = c.columns, m = c3.generate(n)), a.podStatusData = c.columns;
 }
-function k(a) {
-var b = f(a), c = a.spec.containers.length;
+function j(a) {
+var b = e(a), c = a.spec.containers.length;
 return b === c;
 }
-function l(a) {
-if (d(a)) return "Terminating";
-var b = e(a);
-return _.some(b, {
+function k(a) {
+if (c(a)) return "Terminating";
+var e = d(a);
+return _.some(e, {
 severity:"error"
-}) ? "Failed" :_.isEmpty(b) ? c(a) ? "Pulling" :"Running" !== a.status.phase || k(a) ? _.get(a, "status.phase", "Unknown") :"Not Ready" :"Warning";
+}) ? "Error" :_.isEmpty(e) ? b(a) ? "Pulling" :"Running" !== a.status.phase || j(a) ? _.get(a, "status.phase", "Unknown") :"Not Ready" :"Warning";
 }
-function m() {
+function l() {
 var b = {};
 return angular.forEach(a.pods, function(a) {
-var c = l(a);
+var c = k(a);
 b[c] = (b[c] || 0) + 1;
 }), b;
 }
-var n, o, p = [ "Running", "Not Ready", "Warning", "Failed", "Pulling", "Pending", "Succeeded", "Terminating", "Unknown" ];
-a.chartId = _.uniqueId("pods-donut-chart-"), o = {
+var m, n, o = [ "Running", "Not Ready", "Warning", "Error", "Pulling", "Pending", "Succeeded", "Terminating", "Unknown" ];
+a.chartId = _.uniqueId("pods-donut-chart-"), n = {
 type:"donut",
 bindto:"#" + a.chartId,
 donut:{
@@ -12346,11 +12350,11 @@ width:150
 legend:{
 show:!1
 },
-onrendered:i,
+onrendered:h,
 tooltip:{
 format:{
 value:function(a, b, c) {
-if (a) return "Empty" === c ? "No pods exist" :a;
+if (a && "Empty" !== c) return a;
 }
 }
 },
@@ -12359,14 +12363,14 @@ duration:350
 },
 data:{
 type:"donut",
-groups:[ p ],
+groups:[ o ],
 order:null,
 colors:{
 Empty:"#ffffff",
 Running:"#00b9e4",
 "Not Ready":"#beedf9",
 Warning:"#f39d3c",
-Failed:"#d9534f",
+Error:"#d9534f",
 Pulling:"#d1d1d1",
 Pending:"#ededed",
 Succeeded:"#3f9c35",
@@ -12378,11 +12382,11 @@ enabled:!1
 }
 }
 };
-var q = _.debounce(j, 350, {
+var p = _.debounce(i, 350, {
 maxWait:500
 });
-a.$watch(m, q, !0), a.$watchGroup([ "desired", "idled" ], i), a.$on("destroy", function() {
-n && (n = n.destroy());
+a.$watch(l, p, !0), a.$watchGroup([ "desired", "idled" ], h), a.$on("destroy", function() {
+m && (m = m.destroy());
 });
 }
 };