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

fix(ingresses): load cluster wide ingresses [r8s-78] (#78)

pull/12292/merge
Steven Kang 2024-10-31 13:08:09 +13:00 committed by GitHub
parent 6c57a00a65
commit 94b1d446c0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/kubernetes/views/applications/create/createApplicationController.js
View File

@ -424,7 +424,7 @@ class KubernetesCreateApplicationController {
const ingressNamesLoaded = this.ingresses.map((i) => i.Name); const ingressNamesLoaded = this.ingresses.map((i) => i.Name);
const areAllIngressesLoaded = uniqueIngressNamesUsed.every((ingressNameUsed) => ingressNamesLoaded.includes(ingressNameUsed)); const areAllIngressesLoaded = uniqueIngressNamesUsed.every((ingressNameUsed) => ingressNamesLoaded.includes(ingressNameUsed));
if (!areAllIngressesLoaded) { if (!areAllIngressesLoaded) {
this.refreshIngresses(); this.refreshIngresses(this.application.ResourcePool);
} }
} }
// update the services // update the services

7
app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathsForm.tsx
View File

@ -53,7 +53,10 @@ export function AppIngressPathsForm({
const allowedIngresses = const allowedIngresses =
ingresses?.filter((ing) => { ingresses?.filter((ing) => {
const className = ing.ClassName || 'none'; const className = ing.ClassName || 'none';
return allowedIngressClasses.includes(className); return (
allowedIngressClasses.includes(className) &&
ing.Namespace === namespace
);
}) || []; }) || [];
return allowedIngresses.flatMap((ing) => return allowedIngresses.flatMap((ing) =>
ing.Hosts?.length ing.Hosts?.length
@ -64,7 +67,7 @@ export function AppIngressPathsForm({
})) }))
: [] : []
); );
}, [ingressControllers, ingresses]); }, [namespace, ingressControllers, ingresses]);
if (ingressesQuery.isError || ingressControllersQuery.isError) { if (ingressesQuery.isError || ingressControllersQuery.isError) {
return <FormError>Unable to load ingresses.</FormError>; return <FormError>Unable to load ingresses.</FormError>;