Skip to content

Commit c239f36

Browse files
Merge pull request #2314 from spadgett/delete-bindings
Automatic merge from submit-queue. Don't set propagationPolicy when deleting bindings Fixes #2312 @jwforres @jeff-phillips-18
2 parents 61b4aba + e305ff3 commit c239f36

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

app/scripts/services/serviceInstances.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,12 @@ angular.module("openshiftConsole")
9191
return;
9292
}
9393

94-
DataService.delete(resource, binding.metadata.name, context)
94+
// TODO - remove once this is resolved https://github.com/kubernetes-incubator/service-catalog/issues/942
95+
var opts = {
96+
propagationPolicy: null
97+
};
98+
99+
DataService.delete(resource, binding.metadata.name, context, opts)
95100
.then(function () {
96101
NotificationsService.addNotification({
97102
type: "success",

dist/scripts/scripts.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -4370,7 +4370,11 @@ namespace: t.metadata.namespace
43704370
}, l = a.getPreferredVersion("servicebindings");
43714371
p(t, n).then(function(t) {
43724372
_.each(t, function(t) {
4373-
t.metadata.deletionTimestamp || i.delete(l, t.metadata.name, r).then(function() {
4373+
if (!t.metadata.deletionTimestamp) {
4374+
var n = {
4375+
propagationPolicy: null
4376+
};
4377+
i.delete(l, t.metadata.name, r, n).then(function() {
43744378
c.addNotification({
43754379
type: "success",
43764380
message: "Binding " + t.metadata.name + "' was marked for deletion."
@@ -4382,6 +4386,7 @@ message: "Binding " + t.metadata.name + "' could not be deleted.",
43824386
details: e("getErrorDetails")(n)
43834387
}), s.error("Binding " + t.metadata.name + "' could not be deleted.", n);
43844388
});
4389+
}
43854390
});
43864391
});
43874392
}

0 commit comments

Comments
 (0)