diff --git a/libs/pages/cluster/src/lib/feature/page-settings-resources-feature/page-settings-resources-feature.tsx b/libs/pages/cluster/src/lib/feature/page-settings-resources-feature/page-settings-resources-feature.tsx index 29fc2c84711..58a2e865dde 100644 --- a/libs/pages/cluster/src/lib/feature/page-settings-resources-feature/page-settings-resources-feature.tsx +++ b/libs/pages/cluster/src/lib/feature/page-settings-resources-feature/page-settings-resources-feature.tsx @@ -13,7 +13,10 @@ import { useEditCluster, useUpdateKarpenterPrivateFargate, } from '@qovery/domains/clusters/feature' -import { type ClusterResourcesEdit, type SCWControlPlaneFeatureType } from '@qovery/shared/interfaces' +import { + type ClusterResourcesEdit, + type SCWControlPlaneFeatureType, +} from '@qovery/shared/interfaces' import { useModal } from '@qovery/shared/ui' import { PageSettingsResources } from '../../ui/page-settings-resources/page-settings-resources' @@ -27,6 +30,8 @@ export const handleSubmit = (data: FieldValues, cluster: Cluster): Cluster => { max_running_nodes: data['nodes'][1], min_running_nodes: data['nodes'][0], disk_size: data['disk_size'], + disk_iops: cluster.cloud_provider === 'AWS' ? data['disk_iops'] : undefined, + disk_throughput: cluster.cloud_provider === 'AWS' ? data['disk_throughput'] : undefined, instance_type: data['instance_type'], } @@ -40,6 +45,8 @@ export const handleSubmit = (data: FieldValues, cluster: Cluster): Cluster => { value: { spot_enabled: data['karpenter'].spot_enabled ?? false, disk_size_in_gib: data['karpenter'].disk_size_in_gib, + disk_iops: data['karpenter'].disk_iops, + disk_throughput: data['karpenter'].disk_throughput, default_service_architecture: data['karpenter'].default_service_architecture, qovery_node_pools: data['karpenter'].qovery_node_pools, }, @@ -53,6 +60,8 @@ export const handleSubmit = (data: FieldValues, cluster: Cluster): Cluster => { value: { spot_enabled: data['karpenter'].spot_enabled ?? false, disk_size_in_gib: data['karpenter'].disk_size_in_gib, + disk_iops: data['karpenter'].disk_iops, + disk_throughput: data['karpenter'].disk_throughput, default_service_architecture: data['karpenter'].default_service_architecture, qovery_node_pools: data['karpenter'].qovery_node_pools, }, @@ -100,11 +109,15 @@ function SettingsResourcesFeature({ cluster }: SettingsResourcesFeatureProps) { instance_type: cluster.instance_type, nodes: [cluster.min_running_nodes || 1, cluster.max_running_nodes || 1], disk_size: cluster.disk_size || 0, + disk_iops: cluster.disk_iops, + disk_throughput: cluster.disk_throughput, karpenter: karpenterFeature ? { enabled: true, spot_enabled: karpenterFeature.value.spot_enabled, disk_size_in_gib: karpenterFeature.value.disk_size_in_gib, + disk_iops: karpenterFeature.value.disk_iops, + disk_throughput: karpenterFeature.value.disk_throughput, default_service_architecture: karpenterFeature.value.default_service_architecture, qovery_node_pools: karpenterFeature.value.qovery_node_pools, } diff --git a/libs/pages/clusters/src/lib/feature/page-clusters-create-feature/step-summary-feature/step-summary-feature.tsx b/libs/pages/clusters/src/lib/feature/page-clusters-create-feature/step-summary-feature/step-summary-feature.tsx index f0ef031c32a..4e30c75c51c 100644 --- a/libs/pages/clusters/src/lib/feature/page-clusters-create-feature/step-summary-feature/step-summary-feature.tsx +++ b/libs/pages/clusters/src/lib/feature/page-clusters-create-feature/step-summary-feature/step-summary-feature.tsx @@ -251,9 +251,11 @@ export function StepSummaryFeature() { value: { spot_enabled: resourcesData.karpenter.spot_enabled, disk_size_in_gib: resourcesData.karpenter.disk_size_in_gib, + disk_iops: resourcesData.karpenter.disk_iops, + disk_throughput: resourcesData.karpenter.disk_throughput, default_service_architecture: resourcesData.karpenter.default_service_architecture, qovery_node_pools: resourcesData.karpenter.qovery_node_pools, - }, + } as any, }) } @@ -341,6 +343,8 @@ export function StepSummaryFeature() { min_running_nodes: resourcesData.nodes[0], max_running_nodes: resourcesData.nodes[1], disk_size: resourcesData.disk_size, + disk_iops: generalData.cloud_provider === 'AWS' ? resourcesData.disk_iops : undefined, + disk_throughput: generalData.cloud_provider === 'AWS' ? resourcesData.disk_throughput : undefined, instance_type: resourcesData.instance_type, kubernetes: resourcesData.cluster_type as KubernetesEnum, features: formatFeatures as ClusterRequestFeaturesInner[], diff --git a/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-resources-settings/cluster-resources-settings.tsx b/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-resources-settings/cluster-resources-settings.tsx index 704298ad637..21139df7a5c 100644 --- a/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-resources-settings/cluster-resources-settings.tsx +++ b/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-resources-settings/cluster-resources-settings.tsx @@ -386,7 +386,7 @@ export function ClusterResourcesSettings(props: ClusterResourcesSettingsProps) { )} {props.fromDetail && ( -