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

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -5640,12 +5640,6 @@ var b = 0;
 return a && a.forEach(function(a) {
 a.state && a.state.running && b++;
 }), b;
-}, a.showDebugAction = function(c) {
-if ("Completed" === _.get(a, "pod.status.phase")) return !1;
-if (z(a.pod, "openshift.io/build.name")) return !1;
-if (b("isDebugPod")(a.pod)) return !1;
-var d = _.get(c, "state.waiting.reason");
-return "ImagePullBackOff" !== d && "ErrImagePull" !== d && (!_.get(c, "state.running") || !c.ready);
 }, a.$on("$destroy", function() {
 g.unwatchAll(n), m(), $(window).off("resize.terminalsize");
 });
@@ -11069,7 +11063,36 @@ a.model.editing = !1;
 };
 }
 };
-}), angular.module("openshiftConsole").directive("podTemplate", function() {
+}), angular.module("openshiftConsole").directive("containerStatuses", [ "$filter", function(a) {
+return {
+restrict:"E",
+scope:{
+pod:"=",
+onDebugTerminal:"=?",
+detailed:"=?"
+},
+templateUrl:"views/_container-statuses.html",
+link:function(b) {
+b.hasDebugTerminal = angular.isFunction(b.onDebugTerminal);
+var c = a("isContainerTerminatedSuccessfully"), d = function(a) {
+return _.every(a, c);
+};
+b.$watch("pod", function(a) {
+b.initContainersTerminated = d(a.status.initContainerStatuses), b.expandInitContainers !== !1 && (b.expandInitContainers = !b.initContainersTerminated);
+}), b.toggleInitContainer = function() {
+b.expandInitContainers = !b.expandInitContainers;
+}, b.showDebugAction = function(c) {
+if ("Completed" === _.get(b.pod, "status.phase")) return !1;
+if (a("annotation")(b.pod, "openshift.io/build.name")) return !1;
+if (a("isDebugPod")(b.pod)) return !1;
+var d = _.get(c, "state.waiting.reason");
+return "ImagePullBackOff" !== d && "ErrImagePull" !== d && (!_.get(c, "state.running") || !c.ready);
+}, b.debugTerminal = function(a) {
+if (b.hasDebugTerminal) return b.onDebugTerminal.call(this, a);
+};
+}
+};
+} ]).directive("podTemplate", function() {
 return {
 restrict:"E",
 scope:{
@@ -11081,6 +11104,18 @@ addHealthCheckUrl:"@?"
 },
 templateUrl:"views/_pod-template.html"
 };
+}).directive("podTemplateContainer", function() {
+return {
+restrict:"E",
+scope:{
+container:"=podTemplateContainer",
+imagesByDockerReference:"=",
+builds:"=",
+detailed:"=?",
+labelPrefix:"@?"
+},
+templateUrl:"views/_pod-template-container.html"
+};
 }).directive("annotations", function() {
 return {
 restrict:"E",
@@ -14903,6 +14938,10 @@ return a.state.waiting && "CrashLoopBackOff" === a.state.waiting.reason;
 return function(a) {
 return a.state.terminated && 0 !== a.state.terminated.exitCode;
 };
+}).filter("isContainerTerminatedSuccessfully", function() {
+return function(a) {
+return a.state.terminated && 0 === a.state.terminated.exitCode;
+};
 }).filter("isContainerUnprepared", function() {
 return function(a) {
 if (!a.state.running || a.ready !== !1 || !a.state.running.startedAt) return !1;
@@ -16161,6 +16200,64 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
   );
 
 
+  $templateCache.put('views/_container-statuses.html',
+    " <div ng-if=\"detailed && pod.status.initContainerStatuses.length\">\n" +
+    "<h4 class=\"mar-bottom-xl\" row ng-if=\"initContainersTerminated\">\n" +
+    "<span><i class=\"fa fa-check text-success\"></i></span>\n" +
+    "<span flex>\n" +
+    "<ng-pluralize count=\"pod.status.initContainerStatuses.length\" when=\"{'1': '&nbsp;Init container {{pod.status.initContainerStatuses[0].name}}','other': '&nbsp;{} init containers'}\">\n" +
+    "</ng-pluralize>\n" +
+    "completed successfully\n" +
+    "</span>\n" +
+    "<span ng-if=\"initContainersTerminated\">\n" +
+    "<a class=\"page-header-link\" href=\"\" ng-click=\"toggleInitContainer()\">\n" +
+    "<span ng-if=\"!expandInitContainers\">Show</span>\n" +
+    "<span ng-if=\"expandInitContainers\">Hide</span>\n" +
+    "Details\n" +
+    "</a>\n" +
+    "</span>\n" +
+    "</h4>\n" +
+    "<div class=\"animate-if\" ng-if=\"expandInitContainers\" ng-repeat=\"containerStatus in pod.status.initContainerStatuses track by containerStatus.name\">\n" +
+    "<h4 class=\"component-label\">Init container {{containerStatus.name}}</h4>\n" +
+    "<dl class=\"dl-horizontal left\">\n" +
+    "<dt>State:</dt>\n" +
+    "<dd>\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.state\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt ng-if=\"!(containerStatus.lastState | isEmptyObj)\">Last State</dt>\n" +
+    "<dd ng-if=\"!(containerStatus.lastState | isEmptyObj)\">\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.lastState\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt>Ready:</dt>\n" +
+    "<dd>{{containerStatus.ready}}</dd>\n" +
+    "<dt>Restart Count:</dt>\n" +
+    "<dd>{{containerStatus.restartCount}}</dd>\n" +
+    "</dl>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<div ng-repeat=\"containerStatus in pod.status.containerStatuses track by containerStatus.name\">\n" +
+    "<h4>Container {{containerStatus.name}}</h4>\n" +
+    "<dl class=\"dl-horizontal left\">\n" +
+    "<dt>State:</dt>\n" +
+    "<dd>\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.state\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt ng-if=\"!(containerStatus.lastState | isEmptyObj)\">Last State</dt>\n" +
+    "<dd ng-if=\"!(containerStatus.lastState | isEmptyObj)\">\n" +
+    "<kubernetes-object-describe-container-state container-state=\"containerStatus.lastState\"></kubernetes-object-describe-container-state>\n" +
+    "</dd>\n" +
+    "<dt>Ready:</dt>\n" +
+    "<dd>{{containerStatus.ready}}</dd>\n" +
+    "<dt>Restart Count:</dt>\n" +
+    "<dd>{{containerStatus.restartCount}}</dd>\n" +
+    "<div ng-if=\"hasDebugTerminal && showDebugAction(containerStatus) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\n" +
+    "<a href=\"\" ng-click=\"debugTerminal(containerStatus.name)\" role=\"button\">Debug in Terminal</a>\n" +
+    "</div>\n" +
+    "</dl>\n" +
+    "</div>"
+  );
+
+
   $templateCache.put('views/_edit-request-limit.html',
     "<ng-form name=\"form\" ng-if=\"!requestCalculated || !limitCalculated\">\n" +
     "<h3>\n" +
@@ -16210,18 +16307,9 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
   );
 
 
-  $templateCache.put('views/_pod-template.html',
-    " <div ng-if=\"detailed && addHealthCheckUrl && !(podTemplate | hasHealthChecks)\" class=\"alert alert-info\">\n" +
-    "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
-    "<span ng-if=\"podTemplate.spec.containers.length === 1\">This container has no health checks</span>\n" +
-    "<span ng-if=\"podTemplate.spec.containers.length > 1\">Not all containers have health checks</span>\n" +
-    "to ensure your application is running correctly.\n" +
-    "<a ng-href=\"{{addHealthCheckUrl}}\" class=\"nowrap\">Add Health Checks</a>\n" +
-    "</div>\n" +
-    "<div class=\"pod-template-container\">\n" +
-    "<div class=\"pod-template-block\" ng-repeat=\"container in podTemplate.spec.containers\">\n" +
-    "<div class=\"pod-template\">\n" +
-    "<div class=\"component-label\">Container: {{container.name}}</div>\n" +
+  $templateCache.put('views/_pod-template-container.html',
+    " <div class=\"pod-template\">\n" +
+    "<div class=\"component-label\"><span ng-bind-template=\"{{labelPrefix||'Container'}}:\"></span> {{container.name}}</div>\n" +
     "<div row ng-if=\"container.image\" class=\"pod-template-image icon-row\">\n" +
     "<div class=\"icon-wrap\">\n" +
     "<span class=\"pficon pficon-image\" aria-hidden=\"true\"></span>\n" +
@@ -16376,6 +16464,31 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<probe probe=\"container.livenessProbe\"></probe>\n" +
     "</div>\n" +
     "</div>\n" +
+    "</div>"
+  );
+
+
+  $templateCache.put('views/_pod-template.html',
+    " <div ng-if=\"detailed && addHealthCheckUrl && !(podTemplate | hasHealthChecks)\" class=\"alert alert-info\">\n" +
+    "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
+    "<span ng-if=\"podTemplate.spec.containers.length === 1\">Container {{podTemplate.spec.containers[0].name}} does not have health checks</span>\n" +
+    "<span ng-if=\"podTemplate.spec.containers.length > 1\">Not all containers have health checks</span>\n" +
+    "to ensure your application is running correctly.\n" +
+    "<a ng-href=\"{{addHealthCheckUrl}}\" class=\"nowrap\">Add Health Checks</a>\n" +
+    "</div>\n" +
+    "<div ng-if=\"detailed && podTemplate.spec.initContainers.length\">\n" +
+    "<h4>Init Containers</h4>\n" +
+    "<div class=\"pod-template-container\">\n" +
+    "<div class=\"pod-template-block\" ng-repeat=\"container in podTemplate.spec.initContainers\">\n" +
+    "<pod-template-container pod-template-container=\"container\" images-by-docker-reference=\"imagesByDockerReference\" builds=\"builds\" detailed=\"detailed\" label-prefix=\"Init Container\"></pod-template-container>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<div>\n" +
+    "<h4 ng-if=\"detailed\">Containers</h4>\n" +
+    "<div class=\"pod-template-container\">\n" +
+    "<div class=\"pod-template-block\" ng-repeat=\"container in podTemplate.spec.containers\">\n" +
+    "<pod-template-container pod-template-container=\"container\" images-by-docker-reference=\"imagesByDockerReference\" builds=\"builds\" detailed=\"detailed\"></pod-template-container>\n" +
     "<div extension-point extension-name=\"container-links\" extension-types=\"link dom\" extension-args=\"[container, podTemplate]\"></div>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -17285,25 +17398,8 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</span>\n" +
     "</dd>\n" +
     "</dl>\n" +
-    "<div ng-repeat=\"containerStatus in pod.status.containerStatuses | orderBy:'name'\">\n" +
-    "<h4>Container {{containerStatus.name}}</h4>\n" +
-    "<dl class=\"dl-horizontal left\">\n" +
-    "<dt>State:</dt>\n" +
-    "<dd>\n" +
-    "<kubernetes-object-describe-container-state container-state=\"containerStatus.state\"></kubernetes-object-describe-container-state>\n" +
-    "</dd>\n" +
-    "<dt ng-if=\"!(containerStatus.lastState | isEmptyObj)\">Last State</dt>\n" +
-    "<dd ng-if=\"!(containerStatus.lastState | isEmptyObj)\">\n" +
-    "<kubernetes-object-describe-container-state container-state=\"containerStatus.lastState\"></kubernetes-object-describe-container-state>\n" +
-    "</dd>\n" +
-    "<dt>Ready:</dt>\n" +
-    "<dd>{{containerStatus.ready}}</dd>\n" +
-    "<dt>Restart Count:</dt>\n" +
-    "<dd>{{containerStatus.restartCount}}</dd>\n" +
-    "<div ng-if=\"showDebugAction(containerStatus) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\n" +
-    "<a href=\"\" ng-click=\"debugTerminal(containerStatus.name)\" role=\"button\">Debug in Terminal</a>\n" +
-    "</div>\n" +
-    "</dl>\n" +
+    "<div>\n" +
+    "<container-statuses pod=\"pod\" on-debug-terminal=\"debugTerminal\" detailed=\"true\"></container-statuses>\n" +
     "</div>\n" +
     "</div>\n" +
     "<div class=\"col-lg-6\">\n" +