github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/2.5' into develop

pull/5166/head^2
yi-portainer 2021-06-16 17:31:00 +12:00
parent 7f96220a09 1f2a90a722
commit 6a88c2ae36
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/kubernetes/views/configure/configureController.js
View File

@ -141,8 +141,17 @@ class KubernetesConfigureController {
} }
async removeIngressesAcrossNamespaces() { async removeIngressesAcrossNamespaces() {
const promises = [];
const ingressesToDel = _.filter(this.formValues.IngressClasses, { NeedsDeletion: true }); const ingressesToDel = _.filter(this.formValues.IngressClasses, { NeedsDeletion: true });
if (!ingressesToDel.length) {
return;
}
const promises = [];
const oldEndpointID = this.EndpointProvider.endpointID();
this.EndpointProvider.setEndpointID(this.endpoint.Id);
try {
const allResourcePools = await this.KubernetesResourcePoolService.get(); const allResourcePools = await this.KubernetesResourcePoolService.get();
const resourcePools = _.filter( const resourcePools = _.filter(
allResourcePools, allResourcePools,
@ -155,6 +164,9 @@ class KubernetesConfigureController {
promises.push(this.KubernetesIngressService.delete(resourcePool.Namespace.Name, ingress.Name)); promises.push(this.KubernetesIngressService.delete(resourcePool.Namespace.Name, ingress.Name));
}); });
}); });
} finally {
this.EndpointProvider.setEndpointID(oldEndpointID);
}
const responses = await Promise.allSettled(promises); const responses = await Promise.allSettled(promises);
responses.forEach((respons) => { responses.forEach((respons) => {