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

feat(ingress): autodetect ingress controllers EE-673 (#7712)

Browse source
This commit is contained in:
Dakota Walsh 2022-09-27 08:43:24 +13:00 • committed by GitHub
parent c96551e410
commit 89eda13eb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 1252 additions and 1047 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/kubernetes/react/components/index.ts
View file

@ -1,6 +1,7 @@
import angular from 'angular';
import { r2a } from '@/react-tools/react2angular';
import { IngressClassDatatable } from '@/react/kubernetes/cluster/ingressClass/IngressClassDatatable';
import { NamespacesSelector } from '@/react/kubernetes/cluster/RegistryAccessView/NamespacesSelector';
import { StorageAccessModeSelector } from '@/react/kubernetes/cluster/ConfigureView/StorageAccessModeSelector';
import { NamespaceAccessUsersSelector } from '@/react/kubernetes/namespaces/AccessView/NamespaceAccessUsersSelector';
@ -8,6 +9,16 @@ import { CreateNamespaceRegistriesSelector } from '@/react/kubernetes/namespaces
export const componentsModule = angular
.module('portainer.kubernetes.react.components', [])
.component(
'ingressClassDatatable',
r2a(IngressClassDatatable, [
'onChangeAvailability',
'description',
'ingressControllers',
'noIngressControllerLabel',
'view',
])
)
.component(
'namespacesSelector',
r2a(NamespacesSelector, [

10
app/kubernetes/react/views/networks/ingresses/CreateIngressView/CreateIngressView.tsx
View file

@ -158,10 +158,12 @@ export function CreateIngressView() {
);
const ingressClassOptions: Option<string>[] = [
{ label: 'Select an ingress class', value: '' },
...(ingressControllersResults.data?.map((cls) => ({
label: cls.ClassName,
value: cls.ClassName,
})) || []),
...(ingressControllersResults.data
?.filter((cls) => cls.Availability)
.map((cls) => ({
label: cls.ClassName,
value: cls.ClassName,
})) || []),
];
if (!existingIngressClass && ingressRule.IngressClassName) {

14
app/kubernetes/react/views/networks/ingresses/queries.ts
View file

@ -65,14 +65,12 @@ export function useIngresses(
'ingress',
],
async () => {
const ingresses: Ingress[] = [];
for (let i = 0; i < namespaces.length; i += 1) {
const ings = await getIngresses(environmentId, namespaces[i]);
if (ings) {
ingresses.push(...ings);
}
}
return ingresses;
const ingresses = await Promise.all(
namespaces.map((namespace) => getIngresses(environmentId, namespace))
);
// flatten the array and remove empty ingresses
const filteredIngresses = ingresses.flat().filter((ing) => ing);
return filteredIngresses;
},
{
enabled: namespaces.length > 0,