Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

Merge branch 'release/2.5' into develop

Browse source
This commit is contained in:
yi-portainer 2021-05-18 17:02:31 +12:00
commit af03d91e39
11 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/kubernetes/ingress/service.js
View file

@ -77,12 +77,11 @@ export function KubernetesIngressService($async, KubernetesIngresses) {
});
}
function _delete(ingress) {
function _delete(namespace, ingressClassName) {
return $async(async () => {
try {
const params = new KubernetesCommonParams();
params.id = ingress.Name;
const namespace = ingress.Namespace;
params.id = ingressClassName;
await KubernetesIngresses(namespace).delete(params).$promise;
} catch (err) {
throw new PortainerError('Unable to delete ingress', err);

2
app/kubernetes/services/resourcePoolService.js
View file

@ -93,7 +93,7 @@ export function KubernetesResourcePoolService($async, KubernetesNamespaceService
const patch = _.without(newIngresses, ...create);
const createPromises = _.map(create, (i) => KubernetesIngressService.create(i));
const delPromises = _.map(del, (i) => KubernetesIngressService.delete(i));
const delPromises = _.map(del, (i) => KubernetesIngressService.delete(i.Namespace, i.Name));
const patchPromises = _.map(patch, (ing) => {
const old = _.find(oldIngresses, { Name: ing.Name });
ing.Paths = angular.copy(old.Paths);

2
app/kubernetes/views/configure/configureController.js
View file

@ -152,7 +152,7 @@ class KubernetesConfigureController {
ingressesToDel.forEach((ingress) => {
resourcePools.forEach((resourcePool) => {
promises.push(this.KubernetesIngressService.delete({ IngressClass: ingress, Namespace: resourcePool.Namespace.Name }));
promises.push(this.KubernetesIngressService.delete(resourcePool.Namespace.Name, ingress.Name));
});
});