diff --git a/app/kubernetes/ingress/service.js b/app/kubernetes/ingress/service.js index 01fc26b44..dae395870 100644 --- a/app/kubernetes/ingress/service.js +++ b/app/kubernetes/ingress/service.js @@ -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); diff --git a/app/kubernetes/services/resourcePoolService.js b/app/kubernetes/services/resourcePoolService.js index f492c6ef4..ac38e2d4f 100644 --- a/app/kubernetes/services/resourcePoolService.js +++ b/app/kubernetes/services/resourcePoolService.js @@ -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); diff --git a/app/kubernetes/views/configure/configureController.js b/app/kubernetes/views/configure/configureController.js index a66bf5a19..a3c5b4e5e 100644 --- a/app/kubernetes/views/configure/configureController.js +++ b/app/kubernetes/views/configure/configureController.js @@ -150,7 +150,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)); }); });