onChange({ ...values, memoryLimit: value })}
+ max={maxMemoryLimit}
+ step={128}
+ dataCy="k8sAppCreate-memoryLimit"
+ visibleTooltip
+ />
+ )}
{errors?.memoryLimit && (
{errors.memoryLimit}
)}
@@ -74,21 +76,23 @@ export function ResourceReservationFormSection({
tooltip="An instance of this application will reserve this amount of CPU. If the instance CPU usage exceeds the reservation, it might be subject to CPU throttling."
>
-
- onChange(
- typeof value === 'number'
- ? { ...values, cpuLimit: value }
- : { ...values, cpuLimit: value[0] ?? 0 }
- )
- }
- value={values.cpuLimit}
- min={0}
- max={maxCpuLimit}
- step={0.01}
- dataCy="k8sAppCreate-cpuLimitSlider"
- visibleTooltip
- />
+ {maxCpuLimit > 0 && (
+
+ onChange(
+ typeof value === 'number'
+ ? { ...values, cpuLimit: value }
+ : { ...values, cpuLimit: value[0] ?? 0 }
+ )
+ }
+ value={values.cpuLimit}
+ min={0}
+ max={maxCpuLimit}
+ step={0.1}
+ dataCy="k8sAppCreate-cpuLimitSlider"
+ visibleTooltip
+ />
+ )}
{errors?.cpuLimit && (
{errors.cpuLimit}
)}
diff --git a/app/react/kubernetes/applications/components/ResourceReservationFormSection/resourceReservationValidation.ts b/app/react/kubernetes/applications/components/ResourceReservationFormSection/resourceReservationValidation.ts
index 11b5d708d..9b2791768 100644
--- a/app/react/kubernetes/applications/components/ResourceReservationFormSection/resourceReservationValidation.ts
+++ b/app/react/kubernetes/applications/components/ResourceReservationFormSection/resourceReservationValidation.ts
@@ -5,6 +5,7 @@ import { ResourceQuotaFormValues } from './types';
type ValidationData = {
maxMemoryLimit: number;
maxCpuLimit: number;
+ isEnvironmentAdmin: boolean;
};
export function resourceReservationValidation(
@@ -13,16 +14,36 @@ export function resourceReservationValidation(
return object().shape({
memoryLimit: number()
.min(0)
+ .test(
+ 'exhaused',
+ `The memory capacity for this namespace has been exhausted, so you cannot deploy the application.${
+ validationData?.isEnvironmentAdmin
+ ? ''
+ : ' Contact your administrator to expand the memory capacity of the namespace.'
+ }`,
+ () => !!validationData && validationData.maxMemoryLimit > 0
+ )
.max(
validationData?.maxMemoryLimit || 0,
- `Value must be between 0 and ${validationData?.maxMemoryLimit}`
+ ({ value }) =>
+ `Value must be between 0 and ${validationData?.maxMemoryLimit}MB now - the previous value of ${value} exceeds this`
)
.required(),
cpuLimit: number()
.min(0)
+ .test(
+ 'exhaused',
+ `The CPU capacity for this namespace has been exhausted, so you cannot deploy the application.${
+ validationData?.isEnvironmentAdmin
+ ? ''
+ : ' Contact your administrator to expand the CPU capacity of the namespace.'
+ }`,
+ () => !!validationData && validationData.maxCpuLimit > 0
+ )
.max(
validationData?.maxCpuLimit || 0,
- `Value must be between 0 and ${validationData?.maxCpuLimit}`
+ ({ value }) =>
+ `Value must be between 0 and ${validationData?.maxCpuLimit} now - the previous value of ${value} exceeds this`
)
.required(),
});