From 7f31d0296152769e1d0b0cc21bdfba036dc172b7 Mon Sep 17 00:00:00 2001 From: Pierre Gerbelot Date: Thu, 29 Jan 2026 16:22:24 +0100 Subject: [PATCH 1/2] feat(keda): allow keda for GCP cluster --- .../application-settings-resources.tsx | 2 +- .../ui/cluster-general-settings/cluster-general-settings.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx b/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx index 785ad94a861..bce15e01690 100644 --- a/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx +++ b/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx @@ -322,7 +322,7 @@ export function ApplicationSettingsResources({ { label: 'HPA (Horizontal Pod Autoscaler)', value: 'HPA' }, ] - if (cloudProvider === 'AWS' && isKedaCluster && isKedaFeatureEnabled) { + if ((cloudProvider === 'AWS' || cloudProvider === 'GCP') && isKedaCluster && isKedaFeatureEnabled) { options.push({ label: 'KEDA (Event-driven autoscaling)', value: 'KEDA' }) } diff --git a/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx b/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx index f3cc2dac617..c591dcbf160 100644 --- a/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx +++ b/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx @@ -135,7 +135,7 @@ export function ClusterGeneralSettings(props: ClusterGeneralSettingsProps) { )} )} - {fromDetail && cloudProvider === 'AWS' && isKedaFeatureEnabled && ( + {fromDetail && (cloudProvider === 'AWS' || cloudProvider === 'GCP') && isKedaFeatureEnabled && ( Date: Thu, 29 Jan 2026 16:23:06 +0100 Subject: [PATCH 2/2] fix(keda): when creating a service with no autoscaler, we created a service with HPA --- .../page-application-create-feature.tsx | 4 ++-- .../application-settings-resources.tsx | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx index d1151134b45..a3d81fc0e32 100644 --- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx +++ b/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx @@ -70,8 +70,8 @@ export function PageApplicationCreateFeature() { cpu: 500, gpu: 0, min_running_instances: 1, - max_running_instances: 2, - autoscaling_mode: 'HPA', + max_running_instances: 1, + autoscaling_mode: 'NONE', hpa_metric_type: 'CPU', hpa_cpu_average_utilization_percent: 60, }) diff --git a/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx b/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx index bce15e01690..9cd06c79a4e 100644 --- a/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx +++ b/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx @@ -73,17 +73,25 @@ export function ApplicationSettingsResources({ const hpaMemoryAverageUtilizationPercent = watch('hpa_memory_average_utilization_percent') ?? 60 const previousAutoscalingModeRef = useRef(autoscalingMode) - // Adjust min/max values when switching from NONE to HPA or KEDA + // Adjust min/max values when switching between autoscaling modes useEffect(() => { const previousMode = previousAutoscalingModeRef.current + + // When switching from no autoscaling to HPA/KEDA, set min=1 and max=2 if (previousMode === 'NONE' && (autoscalingMode === 'HPA' || autoscalingMode === 'KEDA')) { - // When switching from no autoscaling to HPA/KEDA, set min=1 and max=2 if (minRunningInstances === maxRunningInstances) { setValue('min_running_instances', 1) setValue('max_running_instances', 2) } } + // When switching to no autoscaling (NONE), ensure max equals min + if ((previousMode === 'HPA' || previousMode === 'KEDA') && autoscalingMode === 'NONE') { + if (minRunningInstances !== maxRunningInstances) { + setValue('max_running_instances', minRunningInstances) + } + } + // Set default HPA settings when switching to HPA mode if (autoscalingMode === 'HPA' && !hpaMetricTypeRaw) { const hpaSettings = loadHpaSettingsFromAdvancedSettings(advancedSettings)