Skip to content

Commit 9d862d0

Browse files
committed
Init Containers Watch Status
Watch for init container status updates, and hide details on success
1 parent 4dbc2b4 commit 9d862d0

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

app/scripts/directives/resources.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
angular.module('openshiftConsole')
4-
.directive('containerStatuses', function($filter) {
4+
.directive('containerStatuses', function($filter, $timeout) {
55
return {
66
restrict: 'E',
77
scope: {
@@ -13,16 +13,21 @@ angular.module('openshiftConsole')
1313
link: function(scope) {
1414
scope.hasDebugTerminal = angular.isFunction(scope.startDebugTerminal);
1515

16-
scope.podContainerStatuses = _.get(scope.pod, 'status.containerStatuses', []);
17-
scope.podContainerInitStatuses = _.get(scope.pod, 'status.initContainerStatuses', []);
18-
1916
var haveContainersFailed = function(containerStatuses) {
2017
return _.some(containerStatuses, function (containerStatus) {
2118
return $filter('isContainerFailed')(containerStatus) !== false;
2219
});
2320
};
2421

25-
scope.expandInitContainers = scope.initContainersFailed = haveContainersFailed(scope.podContainerInitStatuses);
22+
scope.$watch('pod.status.initContainerStatuses', function(updatedInitContainerStatuses) {
23+
scope.initContainersFailed = haveContainersFailed(updatedInitContainerStatuses);
24+
25+
$timeout(function() {
26+
if (scope.expandInitContainers !== false) {
27+
scope.expandInitContainers = scope.initContainersFailed;
28+
}
29+
}, 250);
30+
}, true);
2631

2732
scope.toggleInitContainer = function() {
2833
scope.expandInitContainers = !scope.expandInitContainers;

app/views/_container-statuses.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<h4 row>
1010
<span><i class="pficon" ng-class="{'pficon-ok': !initContainersFailed}"></i></span>
1111
<span flex>
12-
<span ng-if="!initContainersFailed"> &nbsp;{{podContainerInitStatuses.length}}</span>
13-
<ng-pluralize count="podContainerInitStatuses.length"
12+
<span ng-if="!initContainersFailed"> &nbsp;{{pod.status.initContainerStatuses.length}}</span>
13+
<ng-pluralize count="pod.status.initContainerStatuses.length"
1414
when="{'1': 'Init Container','other': 'Init Containers'}">
1515
</ng-pluralize>
1616
<span ng-if="!initContainersFailed">completed successfully</span>
@@ -19,9 +19,9 @@ <h4 row>
1919
<a class="page-header-link" href="" ng-click="toggleInitContainer()" ng-if="expandInitContainers">Hide Details</a>
2020
</h4>
2121

22-
<div class="pod-template-block"
22+
<div class="pod-template-block animate-if"
2323
ng-if="expandInitContainers"
24-
ng-repeat="containerStatus in podContainerInitStatuses" >
24+
ng-repeat="containerStatus in pod.status.initContainerStatuses" >
2525

2626
<div class="pod-template">
2727
<div class="component-label">Init Container: {{containerStatus.name}}</div>
@@ -48,7 +48,7 @@ <h4 row>
4848
</div>
4949
</div>
5050

51-
<div ng-repeat="containerStatus in podContainerStatuses" >
51+
<div ng-repeat="containerStatus in pod.status.containerStatuses" >
5252
<h4>Container {{containerStatus.name}}</h4>
5353

5454
<dl class="dl-horizontal left">

0 commit comments

Comments
 (0)