mirror of
https://github.com/portainer/portainer.git
synced 2025-07-23 15:29:42 +02:00
feat(app): add ingress to app service form [EE-5569] (#9106)
This commit is contained in:
Ali
GitHub
parent
8c16fbb8aa
commit
89c1d0e337
47 changed files with 1929 additions and 1181 deletions
|
|
@ -0,0 +1,236 @@
|
|||
import { FormikErrors } from 'formik';
|
||||
import { ChangeEvent, useRef } from 'react';
|
||||
import { Plus, Trash2 } from 'lucide-react';
|
||||
|
||||
import { FormError } from '@@/form-components/FormError';
|
||||
import { ButtonSelector } from '@@/form-components/ButtonSelector/ButtonSelector';
|
||||
import { Button } from '@@/buttons';
|
||||
import { Widget } from '@@/Widget';
|
||||
import { Card } from '@@/Card';
|
||||
import { InputGroup } from '@@/form-components/InputGroup';
|
||||
|
||||
import { isErrorType, newPort } from '../utils';
|
||||
import { ContainerPortInput } from '../components/ContainerPortInput';
|
||||
import {
|
||||
ServiceFormValues,
|
||||
ServicePort,
|
||||
ServicePortIngressPath,
|
||||
} from '../types';
|
||||
import { ServicePortInput } from '../components/ServicePortInput';
|
||||
import { AppIngressPathsForm } from '../ingress/AppIngressPathsForm';
|
||||
|
||||
interface Props {
|
||||
services: ServiceFormValues[];
|
||||
serviceIndex: number;
|
||||
onChangeService: (services: ServiceFormValues[]) => void;
|
||||
servicePorts: ServicePort[];
|
||||
onChangePort: (servicePorts: ServicePort[]) => void;
|
||||
serviceName?: string;
|
||||
errors?: string | string[] | FormikErrors<ServicePort>[];
|
||||
namespace?: string;
|
||||
isEditMode?: boolean;
|
||||
}
|
||||
|
||||
export function NodePortServiceForm({
|
||||
services,
|
||||
serviceIndex,
|
||||
onChangeService,
|
||||
servicePorts,
|
||||
onChangePort,
|
||||
errors,
|
||||
serviceName,
|
||||
namespace,
|
||||
isEditMode,
|
||||
}: Props) {
|
||||
const newNodePortPort = newPort(serviceName);
|
||||
// If there's initially a ingress path for the service, allow editing it
|
||||
const { current: initiallyHasIngressPath } = useRef(
|
||||
services[serviceIndex].Ports.some((port) => port.ingressPaths?.length)
|
||||
);
|
||||
|
||||
return (
|
||||
<Widget key={serviceIndex}>
|
||||
<Widget.Body>
|
||||
<div className="flex justify-between">
|
||||
<div className="text-muted vertical-center">NodePort</div>
|
||||
<Button
|
||||
icon={Trash2}
|
||||
color="dangerlight"
|
||||
className="!ml-0"
|
||||
onClick={() => {
|
||||
// remove the service at index in an immutable way
|
||||
const newServices = [
|
||||
...services.slice(0, serviceIndex),
|
||||
...services.slice(serviceIndex + 1),
|
||||
];
|
||||
onChangeService(newServices);
|
||||
}}
|
||||
>
|
||||
Remove service
|
||||
</Button>
|
||||
</div>
|
||||
<div className="control-label !mb-2 !pt-0 text-left">Ports</div>
|
||||
<div className="flex flex-col gap-3">
|
||||
{servicePorts.map((servicePort, portIndex) => {
|
||||
const error = errors?.[portIndex];
|
||||
const servicePortErrors = isErrorType<ServicePort>(error)
|
||||
? error
|
||||
: undefined;
|
||||
const ingressPathsErrors = isErrorType<ServicePortIngressPath[]>(
|
||||
servicePortErrors?.ingressPaths
|
||||
)
|
||||
? servicePortErrors?.ingressPaths
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<Card key={portIndex} className="flex flex-col gap-y-3">
|
||||
<div className="flex flex-grow flex-wrap justify-between gap-x-4 gap-y-1">
|
||||
<div className="inline-flex min-w-min flex-grow basis-3/4 flex-wrap gap-2">
|
||||
<div className="flex min-w-min basis-1/4 flex-col">
|
||||
<ContainerPortInput
|
||||
serviceIndex={serviceIndex}
|
||||
portIndex={portIndex}
|
||||
value={servicePort.targetPort}
|
||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
||||
const newServicePorts = [...servicePorts];
|
||||
const newValue =
|
||||
e.target.value === ''
|
||||
? undefined
|
||||
: Number(e.target.value);
|
||||
newServicePorts[portIndex] = {
|
||||
...newServicePorts[portIndex],
|
||||
targetPort: newValue,
|
||||
port: newValue,
|
||||
};
|
||||
onChangePort(newServicePorts);
|
||||
}}
|
||||
/>
|
||||
{servicePortErrors?.targetPort && (
|
||||
<FormError>{servicePortErrors.targetPort}</FormError>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex min-w-min basis-1/4 flex-col">
|
||||
<ServicePortInput
|
||||
serviceIndex={serviceIndex}
|
||||
portIndex={portIndex}
|
||||
value={servicePort.port}
|
||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
||||
const newServicePorts = [...servicePorts];
|
||||
newServicePorts[portIndex] = {
|
||||
...newServicePorts[portIndex],
|
||||
port:
|
||||
e.target.value === ''
|
||||
? undefined
|
||||
: Number(e.target.value),
|
||||
};
|
||||
onChangePort(newServicePorts);
|
||||
}}
|
||||
/>
|
||||
{servicePortErrors?.port && (
|
||||
<FormError>{servicePortErrors.port}</FormError>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex min-w-min basis-1/4 flex-col">
|
||||
<InputGroup size="small">
|
||||
<InputGroup.Addon>Nodeport</InputGroup.Addon>
|
||||
<InputGroup.Input
|
||||
type="number"
|
||||
className="form-control min-w-max"
|
||||
name={`node_port_${portIndex}`}
|
||||
placeholder="30080"
|
||||
min="30000"
|
||||
max="32767"
|
||||
value={servicePort.nodePort ?? ''}
|
||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
||||
const newServicePorts = [...servicePorts];
|
||||
newServicePorts[portIndex] = {
|
||||
...newServicePorts[portIndex],
|
||||
nodePort:
|
||||
e.target.value === ''
|
||||
? undefined
|
||||
: Number(e.target.value),
|
||||
};
|
||||
onChangePort(newServicePorts);
|
||||
}}
|
||||
data-cy={`k8sAppCreate-nodePort_${portIndex}`}
|
||||
/>
|
||||
</InputGroup>
|
||||
{servicePortErrors?.nodePort && (
|
||||
<FormError>{servicePortErrors.nodePort}</FormError>
|
||||
)}
|
||||
</div>
|
||||
<ButtonSelector
|
||||
className="h-[30px]"
|
||||
onChange={(value) => {
|
||||
const newServicePorts = [...servicePorts];
|
||||
newServicePorts[portIndex] = {
|
||||
...newServicePorts[portIndex],
|
||||
protocol: value,
|
||||
};
|
||||
onChangePort(newServicePorts);
|
||||
}}
|
||||
value={servicePort.protocol || 'TCP'}
|
||||
options={[{ value: 'TCP' }, { value: 'UDP' }]}
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
disabled={servicePorts.length === 1}
|
||||
size="small"
|
||||
className="!ml-0 h-[30px]"
|
||||
color="dangerlight"
|
||||
type="button"
|
||||
onClick={() => {
|
||||
// remove the port at the index in an immutable way
|
||||
const newServicePorts = [
|
||||
...servicePorts.slice(0, portIndex),
|
||||
...servicePorts.slice(portIndex + 1),
|
||||
];
|
||||
onChangePort(newServicePorts);
|
||||
}}
|
||||
data-cy={`k8sAppCreate-rmPortButton_${portIndex}`}
|
||||
icon={Trash2}
|
||||
>
|
||||
Remove port
|
||||
</Button>
|
||||
</div>
|
||||
{initiallyHasIngressPath && (
|
||||
<AppIngressPathsForm
|
||||
servicePortIngressPaths={
|
||||
servicePorts[portIndex].ingressPaths
|
||||
}
|
||||
onChangeIngressPaths={(
|
||||
ingressPaths?: ServicePortIngressPath[]
|
||||
) => {
|
||||
const newServicePorts = [...servicePorts];
|
||||
newServicePorts[portIndex].ingressPaths = ingressPaths;
|
||||
onChangePort(newServicePorts);
|
||||
}}
|
||||
namespace={namespace}
|
||||
ingressPathsErrors={ingressPathsErrors}
|
||||
serviceIndex={serviceIndex}
|
||||
portIndex={portIndex}
|
||||
isEditMode={isEditMode}
|
||||
/>
|
||||
)}
|
||||
</Card>
|
||||
);
|
||||
})}
|
||||
<div className="flex">
|
||||
<Button
|
||||
icon={Plus}
|
||||
color="default"
|
||||
className="!ml-0"
|
||||
onClick={() => {
|
||||
const newServicesPorts = [...servicePorts, newNodePortPort];
|
||||
onChangePort(newServicesPorts);
|
||||
}}
|
||||
>
|
||||
Add port
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</Widget.Body>
|
||||
</Widget>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
import { FormikErrors } from 'formik';
|
||||
import { Plus } from 'lucide-react';
|
||||
|
||||
import { KubernetesApplicationPublishingTypes } from '@/kubernetes/models/application/models';
|
||||
|
||||
import { Card } from '@@/Card';
|
||||
import { TextTip } from '@@/Tip/TextTip';
|
||||
import { Button } from '@@/buttons';
|
||||
|
||||
import {
|
||||
serviceFormDefaultValues,
|
||||
generateUniqueName,
|
||||
newPort,
|
||||
} from '../utils';
|
||||
import { ServiceFormValues, ServicePort } from '../types';
|
||||
|
||||
import { NodePortServiceForm } from './NodePortServiceForm';
|
||||
|
||||
interface Props {
|
||||
services: ServiceFormValues[];
|
||||
onChangeService: (services: ServiceFormValues[]) => void;
|
||||
errors?: FormikErrors<ServiceFormValues[]>;
|
||||
appName: string;
|
||||
selector: Record<string, string>;
|
||||
namespace?: string;
|
||||
isEditMode?: boolean;
|
||||
}
|
||||
|
||||
export function NodePortServicesForm({
|
||||
services,
|
||||
onChangeService,
|
||||
errors,
|
||||
appName,
|
||||
selector,
|
||||
namespace,
|
||||
isEditMode,
|
||||
}: Props) {
|
||||
const nodePortServiceCount = services.filter(
|
||||
(service) => service.Type === KubernetesApplicationPublishingTypes.NODE_PORT
|
||||
).length;
|
||||
return (
|
||||
<Card className="pb-5">
|
||||
<div className="flex flex-col gap-6">
|
||||
<TextTip color="blue">
|
||||
Allow access to traffic <b>external</b> to the cluster via a{' '}
|
||||
<b>NodePort service</b>. Not generally recommended for Production use.
|
||||
</TextTip>
|
||||
{nodePortServiceCount > 0 && (
|
||||
<div className="flex w-full flex-col gap-4">
|
||||
{services.map((service, index) =>
|
||||
service.Type ===
|
||||
KubernetesApplicationPublishingTypes.NODE_PORT ? (
|
||||
<NodePortServiceForm
|
||||
key={index}
|
||||
serviceName={service.Name}
|
||||
servicePorts={service.Ports}
|
||||
errors={errors?.[index]?.Ports}
|
||||
onChangePort={(servicePorts: ServicePort[]) => {
|
||||
const newServices = [...services];
|
||||
newServices[index].Ports = servicePorts;
|
||||
onChangeService(newServices);
|
||||
}}
|
||||
services={services}
|
||||
serviceIndex={index}
|
||||
onChangeService={onChangeService}
|
||||
namespace={namespace}
|
||||
isEditMode={isEditMode}
|
||||
/>
|
||||
) : null
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
<div className="flex">
|
||||
<Button
|
||||
color="secondary"
|
||||
className="!ml-0"
|
||||
icon={Plus}
|
||||
size="small"
|
||||
onClick={() => {
|
||||
// create a new service form value and add it to the list of services
|
||||
const newService = structuredClone(serviceFormDefaultValues);
|
||||
newService.Name = generateUniqueName(
|
||||
appName,
|
||||
services.length + 1,
|
||||
services
|
||||
);
|
||||
newService.Type = KubernetesApplicationPublishingTypes.NODE_PORT;
|
||||
const newServicePort = newPort(newService.Name);
|
||||
newService.Ports = [newServicePort];
|
||||
newService.Selector = selector;
|
||||
onChangeService([...services, newService]);
|
||||
}}
|
||||
data-cy="k8sAppCreate-createServiceButton"
|
||||
>
|
||||
Create service
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue