Merge branch 'release/2.5' into develop

app/kubernetes/views/configure/configureController.js

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