Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +02:00
Code Issues Releases Activity

fix(app): NaN validation for autoscaling [EE-6714] (#11237)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Details
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Details
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
Details
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
Details
ci / build_manifests (push) Blocked by required conditions
Details
/ triage (push) Waiting to run
Details
Lint / Run linters (push) Waiting to run
Details
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Details
Test / test-client (push) Waiting to run
Details
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Details
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Details
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Details

Browse source
This commit is contained in:
Ali 2024-02-22 17:36:44 +13:00 • committed by GitHub
parent 90451bfd47
commit 8856bae5c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/react/kubernetes/applications/components/AutoScalingFormSection/autoScalingValidation.ts
View file

@ -1,5 +1,7 @@
import { SchemaOf, boolean, number, object } from 'yup'; import { SchemaOf, boolean, number, object } from 'yup';
import { nanNumberSchema } from '@/react-tools/yup-schemas';
import { AutoScalingFormValues } from './types'; import { AutoScalingFormValues } from './types';
type ValidationData = { type ValidationData = {
@ -14,7 +16,7 @@ export function autoScalingValidation(
isUsed: boolean().required(), isUsed: boolean().required(),
minReplicas: number().when('isUsed', (isUsed: boolean) => minReplicas: number().when('isUsed', (isUsed: boolean) =>
isUsed isUsed
? number() ? nanNumberSchema('Minimum instances is required.')
.required('Minimum instances is required.') .required('Minimum instances is required.')
.min(1, 'Minimum instances must be greater than 0.') .min(1, 'Minimum instances must be greater than 0.')
.test( .test(
@ -33,7 +35,7 @@ export function autoScalingValidation(
), ),
maxReplicas: number().when('isUsed', (isUsed: boolean) => maxReplicas: number().when('isUsed', (isUsed: boolean) =>
isUsed isUsed
? number() ? nanNumberSchema('Maximum instances is required.')
.required('Maximum instances is required.') .required('Maximum instances is required.')
.test( .test(
'minReplicas', 'minReplicas',
@ -58,7 +60,7 @@ export function autoScalingValidation(
'isUsed', 'isUsed',
(isUsed: boolean) => (isUsed: boolean) =>
isUsed isUsed
? number() ? nanNumberSchema('Target CPU utilization percentage is required.')
.min(0, 'Target CPU usage must be greater than 0.') .min(0, 'Target CPU usage must be greater than 0.')
.max(100, 'Target CPU usage must be smaller than 100.') .max(100, 'Target CPU usage must be smaller than 100.')
.required('Target CPU utilization percentage is required.') .required('Target CPU utilization percentage is required.')

10
app/react/kubernetes/applications/components/ResourceReservationFormSection/resourceReservationValidation.ts
View file

@ -23,8 +23,8 @@ export function resourceReservationValidation(
validationData?: ValidationData validationData?: ValidationData
): SchemaOf<ResourceQuotaFormValues> { ): SchemaOf<ResourceQuotaFormValues> {
return object().shape({ return object().shape({
memoryLimit: nanNumberSchema() memoryLimit: nanNumberSchema('Memory limit is required.')
.min(0, 'Value must be greater than or equal to 0') .min(0, 'Value must be greater than or equal to 0.')
.test( .test(
'exhaused', 'exhaused',
`The memory capacity for this namespace has been exhausted, so you cannot deploy the application.${ `The memory capacity for this namespace has been exhausted, so you cannot deploy the application.${
@ -37,7 +37,7 @@ export function resourceReservationValidation(
.max( .max(
validationData?.maxMemoryLimit || 0, validationData?.maxMemoryLimit || 0,
({ value }) => ({ value }) =>
`Value must be between 0 and ${validationData?.maxMemoryLimit}MB now - the previous value of ${value} exceeds this` `Value must be between 0 and ${validationData?.maxMemoryLimit}MB now - the previous value of ${value} exceeds this.`
) )
.test( .test(
'hasSuitableNode', 'hasSuitableNode',
@ -56,7 +56,7 @@ export function resourceReservationValidation(
); );
} }
) )
.required(), .required('Memory limit is required.'),
cpuLimit: number() cpuLimit: number()
.min(0) .min(0)
.test( .test(
@ -71,7 +71,7 @@ export function resourceReservationValidation(
.max( .max(
validationData?.maxCpuLimit || 0, validationData?.maxCpuLimit || 0,
({ value }) => ({ value }) =>
`Value must be between 0 and ${validationData?.maxCpuLimit} now - the previous value of ${value} exceeds this` `Value must be between 0 and ${validationData?.maxCpuLimit} now - the previous value of ${value} exceeds this.`
) )
.test( .test(
'hasSuitableNode', 'hasSuitableNode',