Skip to content

Commit

Permalink
Merge pull request #2314 from spadgett/delete-bindings
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Don't set propagationPolicy when deleting bindings

Fixes #2312

@jwforres @jeff-phillips-18
  • Loading branch information
openshift-merge-robot committed Oct 19, 2017
2 parents 61b4aba + e305ff3 commit c239f36
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion app/scripts/services/serviceInstances.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ angular.module("openshiftConsole")
return;
}

DataService.delete(resource, binding.metadata.name, context)
// TODO - remove once this is resolved https://github.com/kubernetes-incubator/service-catalog/issues/942
var opts = {
propagationPolicy: null
};

DataService.delete(resource, binding.metadata.name, context, opts)
.then(function () {
NotificationsService.addNotification({
type: "success",
Expand Down
7 changes: 6 additions & 1 deletion dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4370,7 +4370,11 @@ namespace: t.metadata.namespace
}, l = a.getPreferredVersion("servicebindings");
p(t, n).then(function(t) {
_.each(t, function(t) {
t.metadata.deletionTimestamp || i.delete(l, t.metadata.name, r).then(function() {
if (!t.metadata.deletionTimestamp) {
var n = {
propagationPolicy: null
};
i.delete(l, t.metadata.name, r, n).then(function() {
c.addNotification({
type: "success",
message: "Binding " + t.metadata.name + "' was marked for deletion."
Expand All @@ -4382,6 +4386,7 @@ message: "Binding " + t.metadata.name + "' could not be deleted.",
details: e("getErrorDetails")(n)
}), s.error("Binding " + t.metadata.name + "' could not be deleted.", n);
});
}
});
});
}
Expand Down

0 comments on commit c239f36

Please sign in to comment.