bump(github.com/openshift/origin-web-console): 6ea5608efac317565723c6ecf28030b3f0fec8b9

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -11392,7 +11392,7 @@ pod:"="
 },
 link:function(b) {
 var c, d = "", e = a(b.pod);
-for (c = 0; c < e.length; c++) d && (d += "<br>"), d += e[c].message;
+for (c = 0; c < e.length; c++) d && (d += "<br>"), "error" === e[c].severity && (b.hasError = !0), d += e[c].message;
 b.content = d;
 },
 templateUrl:"views/directives/_warnings-popover.html"
@@ -12706,7 +12706,7 @@ e.cacheScrollableNode(document.getElementById(a.fixedHeight ? a.logViewerID + "-
 }, 0);
 }
 };
-} ]), angular.module("openshiftConsole").directive("statusIcon", [ function() {
+} ]), angular.module("openshiftConsole").directive("statusIcon", function() {
 return {
 restrict:"E",
 templateUrl:"views/directives/_status-icon.html",
@@ -12719,7 +12719,7 @@ link:function(a, b, c) {
 a.spinning = !angular.isDefined(c.disableAnimation);
 }
 };
-} ]), angular.module("openshiftConsole").directive("ellipsisPulser", [ function() {
+}), angular.module("openshiftConsole").directive("ellipsisPulser", [ function() {
 return {
 restrict:"E",
 scope:{
@@ -12730,7 +12730,7 @@ msg:"@"
 },
 templateUrl:"views/directives/_ellipsis-pulser.html"
 };
-} ]), angular.module("openshiftConsole").directive("podDonut", [ "$timeout", "hashSizeFilter", "isPullingImageFilter", "isTerminatingFilter", "isTroubledPodFilter", "numContainersReadyFilter", "Logger", "ChartsService", function(a, b, c, d, e, f, g, h) {
+} ]), angular.module("openshiftConsole").directive("podDonut", [ "$timeout", "hashSizeFilter", "isPullingImageFilter", "isTerminatingFilter", "podWarningsFilter", "numContainersReadyFilter", "Logger", "ChartsService", function(a, b, c, d, e, f, g, h) {
 return {
 restrict:"E",
 scope:{
@@ -12757,7 +12757,11 @@ var b = f(a), c = a.spec.containers.length;
 return b === c;
 }
 function l(a) {
-return d(a) ? "Terminating" :e(a) ? "Warning" :c(a) ? "Pulling" :"Running" !== a.status.phase || k(a) ? _.get(a, "status.phase", "Unknown") :"Not Ready";
+if (d(a)) return "Terminating";
+var b = e(a);
+return _.some(b), {
+severity:"error"
+} ? "Failed" :b.length ? "Warning" :c(a) ? "Pulling" :"Running" !== a.status.phase || k(a) ? _.get(a, "status.phase", "Unknown") :"Not Ready";
 }
 function m() {
 var b = {};
@@ -14440,21 +14444,25 @@ pod:f.metadata.name,
 message:"The pod has been stuck in the pending state for more than five minutes."
 }), "Running" === f.status.phase && f.status.containerStatuses && _.each(f.status.containerStatuses, function(a) {
 return !!a.state && (c(a) && (e(f) ? g.push({
+severity:"error",
 reason:"NonZeroExitTerminatingPod",
 pod:f.metadata.name,
 container:a.name,
 message:"The container " + a.name + " did not stop cleanly when terminated (exit code " + a.state.terminated.exitCode + ")."
 }) :g.push({
+severity:"warning",
 reason:"NonZeroExit",
 pod:f.metadata.name,
 container:a.name,
 message:"The container " + a.name + " failed (exit code " + a.state.terminated.exitCode + ")."
 })), b(a) && g.push({
+severity:"error",
 reason:"Looping",
 pod:f.metadata.name,
 container:a.name,
 message:"The container " + a.name + " is crashing frequently. It must wait before it will be restarted again."
 }), void (d(a) && g.push({
+severity:"warning",
 reason:"Unprepared",
 pod:f.metadata.name,
 container:a.name,
@@ -21098,7 +21106,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
 
   $templateCache.put('views/directives/_warnings-popover.html',
     "<span ng-if=\"content\">\n" +
-    "<span dynamic-content=\"{{content | middleEllipses:350:'...<br>...'}}\" data-toggle=\"popover\" data-trigger=\"hover\" data-html=\"true\" class=\"pficon pficon-warning-triangle-o warnings-popover\" aria-hidden=\"true\">\n" +
+    "<span dynamic-content=\"{{content | middleEllipses:350:'...<br>...'}}\" data-toggle=\"popover\" data-trigger=\"hover\" data-html=\"true\" class=\"pficon warnings-popover\" ng-class=\"{'pficon-warning-triangle-o': !hasError, 'pficon-error-circle-o': hasError}\" aria-hidden=\"true\">\n" +
     "</span>\n" +
     "<span class=\"sr-only\">{{content}}</span>\n" +
     "</span>"
@@ -23362,9 +23370,6 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<tr>\n" +
     "<td data-title=\"Name\">\n" +
     "<a href=\"{{pod | navigateResourceURL}}\">{{pod.metadata.name}}</a>\n" +
-    "<span ng-if=\"pod | isTroubledPod\">\n" +
-    "<pod-warnings pod=\"pod\"></pod-warnings>\n" +
-    "</span>\n" +
     "<span ng-if=\"pod | isDebugPod\">\n" +
     "<i class=\"fa fa-bug info-popover\" aria-hidden=\"true\" data-toggle=\"popover\" data-trigger=\"hover\" dynamic-content=\"Debugging pod {{pod | debugPodSourceName}}\"></i>\n" +
     "<span class=\"sr-only\">Debugging pod {{pod | debugPodSourceName}}</span>\n" +
@@ -25216,9 +25221,6 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div class=\"list-view-pf-description\">\n" +
     "<div class=\"list-group-item-heading\">\n" +
     "<a ng-href=\"{{pod | navigateResourceURL}}\"><span ng-bind-html=\"pod.metadata.name | highlightKeywords : filterKeywords\"></span></a>\n" +
-    "<span ng-if=\"pod | isTroubledPod\">\n" +
-    "<pod-warnings pod=\"pod\"></pod-warnings>\n" +
-    "</span>\n" +
     "<small>created <span am-time-ago=\"pod.metadata.creationTimestamp\"></span></small>\n" +
     "</div>\n" +
     "<div class=\"list-group-item-text\">\n" +