Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00
Code Issues Releases Activity

fix(k8s/ingress): remove only selected ingress (#5035)

Browse source 
* fix(k8s/ingress): remove only selected ingress

* fix(k8s/ingress): remove ingress from namespace
This commit is contained in:
Chaim Lev-Ari 2021-05-07 00:49:56 +03:00 • committed by GitHub
parent 564bea7575
commit b7980f1b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 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 () => { return $async(async () => {
try { try {
const params = new KubernetesCommonParams(); const params = new KubernetesCommonParams();
params.id = ingress.Name; params.id = ingressClassName;
const namespace = ingress.Namespace;
await KubernetesIngresses(namespace).delete(params).$promise; await KubernetesIngresses(namespace).delete(params).$promise;
} catch (err) { } catch (err) {
throw new PortainerError('Unable to delete ingress', 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 patch = _.without(newIngresses, ...create);
const createPromises = _.map(create, (i) => KubernetesIngressService.create(i)); 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 patchPromises = _.map(patch, (ing) => {
const old = _.find(oldIngresses, { Name: ing.Name }); const old = _.find(oldIngresses, { Name: ing.Name });
ing.Paths = angular.copy(old.Paths); ing.Paths = angular.copy(old.Paths);

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

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