Bug 1462067 - Give option to delete pod without grace period

app/scripts/directives/deleteLink.js

@@ -62,7 +62,8 @@ angular.module("openshiftConsole")
 
         // Checkbox value
         scope.options = {
-          deleteHPAs: true
+          deleteHPAs: true,
+          deleteImmediately: false
         };
 
         var showAlert = function(alert) {
@@ -141,11 +142,16 @@ angular.module("openshiftConsole")
             var formattedResource = typeDisplayName + ' ' + "\'"  + (scope.displayName ? scope.displayName : resourceName) + "\'";
             var context = (scope.kind === 'Project') ? {} : {namespace: scope.projectName};
 
+            var deleteOptions = {};
+            if (scope.options.deleteImmediately) {
+              deleteOptions.gracePeriodSeconds = 0;
+            }
+
             DataService.delete({
               resource: APIService.kindToResource(kind),
               // group or undefined
               group: scope.group
-            }, resourceName, context)
+            }, resourceName, context, deleteOptions)
             .then(function() {
               NotificationsService.addNotification({
                   type: "success",

app/styles/_core.less

@@ -951,7 +951,7 @@ a.disabled-link {
     .word-break();
   }
   p {
-    font-size: @font-size-large + 1;
+    font-size: @font-size-large;
   }
   .help-block {
     margin-top: 0px;

app/views/modals/delete-resource.html

@@ -46,6 +46,16 @@ <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKin
         </p>
       </div>
 
+      <!--
+        If this is a pod, give the user the option of deleting it immediately with no grace period.
+      -->
+      <div ng-if="kind === 'Pod'" class="checkbox">
+        <label>
+          <input type="checkbox" ng-model="options.deleteImmediately">
+          Delete pod immediately without waiting for the processes to terminate gracefully
+        </label>
+      </div>
+
       <!--
         If this is a deployment config or replication controller with associated HPAs, prompt to
         delete the HPAs as well.
@@ -61,17 +71,20 @@ <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKin
             It is recommended you delete the autoscalers with the resource they scale.
           </span>
         </p>
-        <label>
-          <input type="checkbox" ng-model="options.deleteHPAs">
-          Delete
-          <span ng-if="hpaList.length === 1">
-            Horizontal Pod Autoscaler '<strong>{{hpaList[0].metadata.name}}</strong>'
-          </span>
-          <span ng-if="hpaList.length > 1">
-            {{hpaList.length}} associated Horizontal Pod Autoscalers
-          </span>
-        </label>
+        <div class="checkbox">
+          <label>
+            <input type="checkbox" ng-model="options.deleteHPAs">
+            Delete
+            <span ng-if="hpaList.length === 1">
+              Horizontal Pod Autoscaler '<strong>{{hpaList[0].metadata.name}}</strong>'
+            </span>
+            <span ng-if="hpaList.length > 1">
+              {{hpaList.length}} associated Horizontal Pod Autoscalers
+            </span>
+          </label>
+        </div>
       </div>
+
     </div>
     <div class="modal-footer">
       <button ng-disabled="typeNameToConfirm && confirmName !== resourceName && confirmName !== displayName" class="btn btn-lg btn-danger" type="submit" ng-click="delete();">Delete</button>

dist/scripts/scripts.js

@@ -8786,7 +8786,8 @@ return angular.isDefined(b.buttonOnly) ? "views/directives/delete-button.html" :
 replace:!0,
 link:function(d, e, k) {
 "Project" === k.kind && (d.isProject = !0), d.options = {
-deleteHPAs:!0
+deleteHPAs:!0,
+deleteImmediately:!1
 };
 var l = function(a) {
 d.stayOnCurrentPage ? d.alerts[a.name] = a.data :i.addNotification(a.data);
@@ -8830,11 +8831,11 @@ scope:d
 b.result.then(function() {
 var a = d.kind, b = d.resourceName, e = d.typeDisplayName || c("humanizeKind")(a), h = e + " '" + (d.displayName ? d.displayName :b) + "'", k = "Project" === d.kind ? {} :{
 namespace:d.projectName
-};
-g["delete"]({
+}, l = {};
+d.options.deleteImmediately && (l.gracePeriodSeconds = 0), g["delete"]({
 resource:f.kindToResource(a),
 group:d.group
-}, b, k).then(function() {
+}, b, k, l).then(function() {
 i.addNotification({
 type:"success",
 message:_.capitalize(h) + " was marked for deletion."

dist/scripts/templates.js

@@ -10701,6 +10701,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</p>\n" +
     "</div>\n" +
     "\n" +
+    "<div ng-if=\"kind === 'Pod'\" class=\"checkbox\">\n" +
+    "<label>\n" +
+    "<input type=\"checkbox\" ng-model=\"options.deleteImmediately\">\n" +
+    "Delete pod immediately without waiting for the processes to terminate gracefully\n" +
+    "</label>\n" +
+    "</div>\n" +
+    "\n" +
     "<div ng-if=\"hpaList.length > 0\">\n" +
     "<p>\n" +
     "<span ng-if=\"hpaList.length === 1\">\n" +
@@ -10710,6 +10717,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "This resource has autoscalers associated with it. It is recommended you delete the autoscalers with the resource they scale.\n" +
     "</span>\n" +
     "</p>\n" +
+    "<div class=\"checkbox\">\n" +
     "<label>\n" +
     "<input type=\"checkbox\" ng-model=\"options.deleteHPAs\">\n" +
     "Delete\n" +
@@ -10722,6 +10730,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</label>\n" +
     "</div>\n" +
     "</div>\n" +
+    "</div>\n" +
     "<div class=\"modal-footer\">\n" +
     "<button ng-disabled=\"typeNameToConfirm && confirmName !== resourceName && confirmName !== displayName\" class=\"btn btn-lg btn-danger\" type=\"submit\" ng-click=\"delete();\">Delete</button>\n" +
     "<button class=\"btn btn-lg btn-default\" type=\"button\" ng-click=\"cancel();\">Cancel</button>\n" +