Merge pull request #1739 from jwforres/delete-svc-cat-resources

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/deleteLink.js

@@ -147,6 +147,11 @@ angular.module("openshiftConsole")
               deleteOptions.gracePeriodSeconds = 0;
             }
 
+            // TODO - remove once this is resolved https://github.com/kubernetes-incubator/service-catalog/issues/942
+            if (scope.group === 'servicecatalog.k8s.io') {
+              deleteOptions.propagationPolicy = null;
+            }
+
             DataService.delete({
               resource: APIService.kindToResource(kind),
               // group or undefined

app/scripts/directives/overview/serviceInstanceRow.js

@@ -92,7 +92,8 @@
           resource: 'instances'
         },
         row.apiObject.metadata.name,
-        { namespace: row.apiObject.metadata.namespace })
+        { namespace: row.apiObject.metadata.namespace },
+        { propagationPolicy: null }) // TODO - remove once this is resolved https://github.com/kubernetes-incubator/service-catalog/issues/942
         .then(function() {
           NotificationsService.addNotification({
             type: "success",

app/scripts/directives/unbindService.js

@@ -29,7 +29,11 @@
       DataService.delete({
         group: 'servicecatalog.k8s.io',
         resource: 'bindings'
-      }, ctrl.selectedBinding.metadata.name, context).then(_.noop, function(err) {
+      },
+      ctrl.selectedBinding.metadata.name,
+      context,
+      { propagationPolicy: null })
+      .then(_.noop, function(err) {
         ctrl.error = err;
       });
     };

dist/scripts/scripts.js

@@ -8842,7 +8842,7 @@ 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
 }, l = {};
-d.options.deleteImmediately && (l.gracePeriodSeconds = 0), g["delete"]({
+d.options.deleteImmediately && (l.gracePeriodSeconds = 0), "servicecatalog.k8s.io" === d.group && (l.propagationPolicy = null), g["delete"]({
 resource:f.kindToResource(a),
 group:d.group
 }, b, k, l).then(function() {
@@ -12342,7 +12342,9 @@ var d, e, f = this, g = b("serviceInstanceDisplayName"), h = function() {
 c["delete"]({
 group:"servicecatalog.k8s.io",
 resource:"bindings"
-}, f.selectedBinding.metadata.name, e).then(_.noop, function(a) {
+}, f.selectedBinding.metadata.name, e, {
+propagationPolicy:null
+}).then(_.noop, function(a) {
 f.error = a;
 });
 }, i = function() {
@@ -13126,6 +13128,8 @@ group:"servicecatalog.k8s.io",
 resource:"instances"
 }, g.apiObject.metadata.name, {
 namespace:g.apiObject.metadata.namespace
+}, {
+propagationPolicy:null
 }).then(function() {
 f.addNotification({
 type:"success",