Merge pull request #1047 from spadgett/debug-terminal-ImagePullBackOff

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/pod.js

@@ -389,6 +389,27 @@ angular.module('openshiftConsole')
           return running;
         };
 
+        $scope.showDebugAction = function(containerStatus) {
+          if (_.get($scope, 'pod.status.phase') === 'Completed') {
+            return false;
+          }
+
+          if (annotation($scope.pod, 'openshift.io/build.name')) {
+            return false;
+          }
+
+          if ($filter('isDebugPod')($scope.pod)) {
+            return false;
+          }
+
+          var waitingReason = _.get(containerStatus, 'state.waiting.reason');
+          if (waitingReason === 'ImagePullBackOff' || waitingReason === 'ErrImagePull') {
+            return false;
+          }
+
+          return !_.get(containerStatus, 'state.running') || !containerStatus.ready;
+        };
+
         $scope.$on('$destroy', function(){
           DataService.unwatchAll(watches);
           cleanUpDebugPod();

app/views/browse/_pod-details.html

@@ -70,7 +70,7 @@ <h4>Container {{containerStatus.name}}</h4>
           <dd>{{containerStatus.ready}}</dd>
           <dt>Restart Count:</dt>
           <dd>{{containerStatus.restartCount}}</dd>
-          <div ng-if="pod.status.phase !== 'Completed' && !(pod | annotation : 'openshift.io/build.name') && (!containerStatus.state.running || !containerStatus.ready) && !(pod | isDebugPod) && ('pods' | canI : 'create')" class="debug-pod-action">
+          <div ng-if="showDebugAction(containerStatus) && ('pods' | canI : 'create')" class="debug-pod-action">
             <a href="" ng-click="debugTerminal(containerStatus.name)" role="button">Debug in Terminal</a>
           </div>
         </dl>

dist/scripts/scripts.js

@@ -4426,6 +4426,12 @@ 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(l), n(), $(window).off("resize.terminalsize");
 });

dist/scripts/templates.js

@@ -1465,7 +1465,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<dd>{{containerStatus.ready}}</dd>\n" +
     "<dt>Restart Count:</dt>\n" +
     "<dd>{{containerStatus.restartCount}}</dd>\n" +
-    "<div ng-if=\"pod.status.phase !== 'Completed' && !(pod | annotation : 'openshift.io/build.name') && (!containerStatus.state.running || !containerStatus.ready) && !(pod | isDebugPod) && ('pods' | canI : 'create')\" class=\"debug-pod-action\">\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" +