feat: support scaling config for knative deployment types

src/main/java/com/epam/aidial/deployment/manager/dao/entity/deployment/DeploymentEntity.java

@@ -62,14 +62,8 @@ public class DeploymentEntity {
     @JdbcTypeCode(SqlTypes.JSON)
     private PersistenceDeploymentMetadata metadata;
 
-    @Column(name = "initial_scale")
-    private Integer initialScale;
-
-    @Column(name = "min_scale")
-    private Integer minScale;
-
-    @Column(name = "max_scale")
-    private Integer maxScale;
+    @JdbcTypeCode(SqlTypes.JSON)
+    private PersistenceScaling scaling;
 
     @JdbcTypeCode(SqlTypes.JSON)
     private PersistenceResources resources;

src/main/java/com/epam/aidial/deployment/manager/dao/entity/deployment/InferenceDeploymentEntity.java

@@ -36,7 +36,4 @@ public class InferenceDeploymentEntity extends DeploymentEntity {
 
     @JdbcTypeCode(SqlTypes.JSON)
     private List<String> args;
-
-    @JdbcTypeCode(SqlTypes.JSON)
-    private PersistenceScaling scaling;
 }

src/main/java/com/epam/aidial/deployment/manager/dao/mapper/PersistenceDeploymentMapper.java

@@ -118,15 +118,13 @@ public void updateEntityFromDomain(Deployment domain, DeploymentEntity existingE
         existingEntity.setUrl(updatedEntity.getUrl());
         existingEntity.setStatus(updatedEntity.getStatus());
         existingEntity.setContainerPort(updatedEntity.getContainerPort());
-        existingEntity.setInitialScale(updatedEntity.getInitialScale());
-        existingEntity.setMaxScale(updatedEntity.getMaxScale());
-        existingEntity.setMinScale(updatedEntity.getMinScale());
         existingEntity.setEnvs(updatedEntity.getEnvs());
         existingEntity.setMetadata(updatedEntity.getMetadata());
         existingEntity.setResources(updatedEntity.getResources());
         existingEntity.setProbeProperties(updatedEntity.getProbeProperties());
         existingEntity.setAuthor(updatedEntity.getAuthor());
         existingEntity.setAllowedDomains(updatedEntity.getAllowedDomains());
+        existingEntity.setScaling(updatedEntity.getScaling());
 
         if (existingEntity instanceof McpDeploymentEntity existingMcp
                 && updatedEntity instanceof McpDeploymentEntity updatedMcp) {
@@ -146,7 +144,6 @@ public void updateEntityFromDomain(Deployment domain, DeploymentEntity existingE
             existingInference.setSource(updatedInference.getSource());
             existingInference.setCommand(updatedInference.getCommand());
             existingInference.setArgs(updatedInference.getArgs());
-            existingInference.setScaling(updatedInference.getScaling());
         }
     }
 

src/main/java/com/epam/aidial/deployment/manager/model/deployment/AdapterDeployment.java

@@ -1,9 +1,9 @@
 package com.epam.aidial.deployment.manager.model.deployment;
 
-import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
-@AllArgsConstructor
+@NoArgsConstructor
 public class AdapterDeployment extends Deployment {
 }

src/main/java/com/epam/aidial/deployment/manager/model/deployment/CreateAdapterDeployment.java

@@ -1,7 +1,9 @@
 package com.epam.aidial.deployment.manager.model.deployment;
 
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
+@NoArgsConstructor
 public class CreateAdapterDeployment extends CreateDeployment {
 }

src/main/java/com/epam/aidial/deployment/manager/model/deployment/CreateDeployment.java

@@ -3,6 +3,7 @@
 import com.epam.aidial.deployment.manager.model.DeploymentMetadata;
 import com.epam.aidial.deployment.manager.model.ImageType;
 import com.epam.aidial.deployment.manager.model.Resources;
+import com.epam.aidial.deployment.manager.model.Scaling;
 import com.epam.aidial.deployment.manager.model.probe.ProbeProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -25,9 +26,7 @@ public abstract class CreateDeployment {
     private String displayName;
     private String description;
     private DeploymentMetadata metadata;
-    private Integer initialScale;
-    private Integer minScale;
-    private Integer maxScale;
+    private Scaling scaling;
     private Resources resources;
     private ProbeProperties probeProperties;
     private Integer containerPort;

src/main/java/com/epam/aidial/deployment/manager/model/deployment/CreateInferenceDeployment.java

@@ -1,6 +1,5 @@
 package com.epam.aidial.deployment.manager.model.deployment;
 
-import com.epam.aidial.deployment.manager.model.Scaling;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -26,6 +25,4 @@ public class CreateInferenceDeployment extends CreateDeployment {
     private List<String> command;
     @Nullable
     private List<String> args;
-    @Nullable
-    private Scaling scaling;
 }

src/main/java/com/epam/aidial/deployment/manager/model/deployment/CreateInterceptorDeployment.java

@@ -1,7 +1,9 @@
 package com.epam.aidial.deployment.manager.model.deployment;
 
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
+@NoArgsConstructor
 public class CreateInterceptorDeployment extends CreateDeployment {
 }

src/main/java/com/epam/aidial/deployment/manager/model/deployment/Deployment.java

@@ -5,6 +5,7 @@
 import com.epam.aidial.deployment.manager.model.EnvVar;
 import com.epam.aidial.deployment.manager.model.ImageType;
 import com.epam.aidial.deployment.manager.model.Resources;
+import com.epam.aidial.deployment.manager.model.Scaling;
 import com.epam.aidial.deployment.manager.model.probe.ProbeProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -39,9 +40,7 @@ public abstract class Deployment {
     private String description;
     private List<EnvVar> envs;
     private DeploymentMetadata metadata;
-    private Integer initialScale;
-    private Integer minScale;
-    private Integer maxScale;
+    private Scaling scaling;
     private Resources resources;
     private ProbeProperties probeProperties;
     private DeploymentStatus status;

src/main/java/com/epam/aidial/deployment/manager/model/deployment/InferenceDeployment.java

@@ -1,6 +1,5 @@
 package com.epam.aidial.deployment.manager.model.deployment;
 
-import com.epam.aidial.deployment.manager.model.Scaling;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -26,6 +25,4 @@ public class InferenceDeployment extends Deployment {
     private List<String> command;
     @Nullable
     private List<String> args;
-    @Nullable
-    private Scaling scaling;
 }

src/main/java/com/epam/aidial/deployment/manager/model/deployment/InterceptorDeployment.java

@@ -1,9 +1,9 @@
 package com.epam.aidial.deployment.manager.model.deployment;
 
-import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
-@AllArgsConstructor
+@NoArgsConstructor
 public class InterceptorDeployment extends Deployment {
 }

src/main/java/com/epam/aidial/deployment/manager/service/deployment/DeploymentService.java

@@ -415,9 +415,7 @@ private static boolean isApplicableForRollingUpdate(Deployment existing, Deploym
                 || specializedUpdate
                 || !Objects.equals(existing.getImageDefinitionId(), updated.getImageDefinitionId())
                 || !Objects.equals(existing.getContainerPort(), updated.getContainerPort())
-                || !Objects.equals(existing.getInitialScale(), updated.getInitialScale())
-                || !Objects.equals(existing.getMinScale(), updated.getMinScale())
-                || !Objects.equals(existing.getMaxScale(), updated.getMaxScale())
+                || !Objects.equals(existing.getScaling(), updated.getScaling())
                 || !Objects.equals(existing.getResources(), updated.getResources());
     }
 

src/main/java/com/epam/aidial/deployment/manager/service/deployment/KnativeDeploymentManager.java

@@ -117,9 +117,7 @@ protected Service prepareServiceSpec(Deployment deployment) {
                 userDefinedSensitiveEnvs,
                 userDefinedSensitiveFileEnvs,
                 imageDefinition.getImageName(),
-                deployment.getInitialScale(),
-                deployment.getMinScale(),
-                deployment.getMaxScale(),
+                deployment.getScaling(),
                 deployment.getResources(),
                 containerPort,
                 deployment.getProbeProperties());

src/main/java/com/epam/aidial/deployment/manager/service/manifest/DeployableManifestGenerator.java

@@ -1,6 +1,7 @@
 package com.epam.aidial.deployment.manager.service.manifest;
 
 import com.epam.aidial.deployment.manager.configuration.AppProperties;
+import com.epam.aidial.deployment.manager.model.ScalingStrategyType;
 import com.epam.aidial.deployment.manager.model.SensitiveEnvVar;
 import com.epam.aidial.deployment.manager.model.SimpleEnvVar;
 import com.epam.aidial.deployment.manager.utils.mapping.ListMapper;
@@ -14,6 +15,9 @@
 
 public abstract class DeployableManifestGenerator extends BaseManifestGenerator {
 
+    protected static final List<ScalingStrategyType> SUPPORTED_SCALING_STRATEGIES =
+            List.of(ScalingStrategyType.ACTIVE_REQUESTS);
+
     public DeployableManifestGenerator(AppProperties appconfig) {
         super(appconfig);
     }

src/main/java/com/epam/aidial/deployment/manager/service/manifest/InferenceManifestGenerator.java

@@ -180,17 +180,8 @@ private void applyScaling(String name,
         var annotations = config.get(InferenceMappers.SERVICE_METADATA_FIELD)
                 .get(InferenceMappers.METADATA_ANNOTATIONS_FIELD).data();
         annotations.put("autoscaling.knative.dev/initial-scale", String.valueOf(initialScale));
-        log.trace("Set annotation autoscaling.knative.dev/initial-scale={} for model '{}'", initialScale, name);
-
-        if (scaling.getStrategy().getType() == ScalingStrategyType.ACTIVE_REQUESTS) {
-            predictor.setScaleMetric(Predictor.ScaleMetric.CONCURRENCY);
-            predictor.setScaleTarget(scaling.getStrategy().getThreshold());
-            log.trace("Applied strategy ACTIVE_REQUESTS: metric={}, target={} for model '{}'",
-                    Predictor.ScaleMetric.CONCURRENCY, scaling.getStrategy().getThreshold(), name);
-        } else {
-            throw new IllegalArgumentException("Scaling strategy '%s' is not supported. Supported strategies: %s"
-                    .formatted(scaling.getStrategy().getType(), List.of(ScalingStrategyType.ACTIVE_REQUESTS)));
-        }
+        log.trace("Set min-scale={}, max-scale={}, initial-scale={} for Inference deployment '{}'",
+                scaling.getMinReplicas(), scaling.getMaxReplicas(), initialScale, name);
 
         if (scaling.getScaleToZeroDelaySeconds() != null) {
             var delay = scaling.getScaleToZeroDelaySeconds();
@@ -199,6 +190,20 @@ private void applyScaling(String name,
             log.trace("Set annotation autoscaling.knative.dev/scale-to-zero-pod-retention-period={} for model '{}'",
                     delayStr, name);
         }
+
+        if (scaling.getStrategy() == null) {
+            return;
+        }
+
+        if (scaling.getStrategy().getType() == ScalingStrategyType.ACTIVE_REQUESTS) {
+            predictor.setScaleMetric(Predictor.ScaleMetric.CONCURRENCY);
+            predictor.setScaleTarget(scaling.getStrategy().getThreshold());
+            log.trace("Applied strategy ACTIVE_REQUESTS: target={} for model '{}'",
+                    scaling.getStrategy().getThreshold(), name);
+        } else {
+            throw new IllegalArgumentException("Scaling strategy '%s' is not supported. Supported strategies: %s"
+                    .formatted(scaling.getStrategy().getType(), SUPPORTED_SCALING_STRATEGIES));
+        }
     }
 
 }

src/main/java/com/epam/aidial/deployment/manager/service/manifest/KnativeManifestGenerator.java

@@ -3,6 +3,8 @@
 import com.epam.aidial.deployment.manager.configuration.AppProperties;
 import com.epam.aidial.deployment.manager.configuration.logging.LogExecution;
 import com.epam.aidial.deployment.manager.model.Resources;
+import com.epam.aidial.deployment.manager.model.Scaling;
+import com.epam.aidial.deployment.manager.model.ScalingStrategyType;
 import com.epam.aidial.deployment.manager.model.SensitiveEnvVar;
 import com.epam.aidial.deployment.manager.model.SensitiveFileEnvVar;
 import com.epam.aidial.deployment.manager.model.SimpleEnvVar;
@@ -30,7 +32,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
 import java.util.List;
 
 @Slf4j
@@ -58,9 +59,7 @@ public Service serviceConfig(
             List<SensitiveEnvVar> sensitiveEnv,
             List<SensitiveFileEnvVar> sensitiveFileEnvs,
             String imageName,
-            @Nullable Integer initScale,
-            @Nullable Integer minScale,
-            @Nullable Integer maxScale,
+            @Nullable Scaling scaling,
             Resources resources,
             @Nullable Integer containerPort,
             @Nullable ProbeProperties probeProperties
@@ -74,9 +73,9 @@ public Service serviceConfig(
         var template = config.get(KnativeMappers.SERVICE_SPEC_FIELD)
                 .get(KnativeMappers.SERVICE_TEMPLATE_FIELD);
 
-        configureAnnotations(template, initScale, minScale, maxScale, probeProperties);
-
         var revisionSpecChain = template.get(KnativeMappers.SERVICE_TEMPLATE_SPEC_FIELD);
+        applyScaling(name, scaling, template, revisionSpecChain);
+        applyProgressDeadline(probeProperties, template);
         var containerChain = revisionSpecChain
                 .getList(KnativeMappers.TEMPLATE_CONTAINERS_FIELD, Mappers.CONTAINER_NAME)
                 .getOrDefault(appConfig.getKnativeServiceContainerConfig().getName(), appConfig::cloneKnativeServiceContainer);
@@ -158,34 +157,56 @@ private void addSecretVolumesAndMountsAndApplySensitiveFileEnv(
         envVarChain.data().setValue(filePathToVolume);
     }
 
-    private void configureAnnotations(
-            MappingChain<RevisionTemplateSpec> template,
-            @Nullable Integer initScale,
-            @Nullable Integer minScale,
-            @Nullable Integer maxScale,
-            @Nullable ProbeProperties probeProperties
-    ) {
-        var templateMetadata = template.get(KnativeMappers.SERVICE_TEMPLATE_METADATA_FIELD).data();
-        var annotations = (templateMetadata.getAnnotations() != null)
-                ? templateMetadata.getAnnotations()
-                : new HashMap<String, String>();
+    private void applyScaling(String name,
+                              @Nullable Scaling scaling,
+                              MappingChain<RevisionTemplateSpec> template,
+                              MappingChain<RevisionSpec> revisionSpecChain) {
+        log.debug("Applying scaling for Knative deployment '{}': {}", name, scaling);
+        if (scaling == null) {
+            return;
+        }
 
-        if (initScale != null) {
-            annotations.put("autoscaling.knative.dev/initial-scale", String.valueOf(initScale));
+        var annotations = template.get(KnativeMappers.SERVICE_TEMPLATE_METADATA_FIELD)
+                .get(KnativeMappers.METADATA_ANNOTATIONS_FIELD).data();
+
+        var initialScale = Math.max(scaling.getMinReplicas(), 1);
+        annotations.put("autoscaling.knative.dev/initial-scale", String.valueOf(initialScale));
+        annotations.put("autoscaling.knative.dev/min-scale", String.valueOf(scaling.getMinReplicas()));
+        annotations.put("autoscaling.knative.dev/max-scale", String.valueOf(scaling.getMaxReplicas()));
+        log.trace("Set min-scale={}, max-scale={}, initial-scale={} for Knative deployment '{}'",
+                scaling.getMinReplicas(), scaling.getMaxReplicas(), initialScale, name);
+
+        if (scaling.getScaleToZeroDelaySeconds() != null) {
+            var delayStr = scaling.getScaleToZeroDelaySeconds() + "s";
+            annotations.put("autoscaling.knative.dev/scale-to-zero-pod-retention-period", delayStr);
+            log.trace("Set annotation autoscaling.knative.dev/scale-to-zero-pod-retention-period={} for Knative deployment '{}'",
+                    delayStr, name);
         }
-        if (minScale != null) {
-            annotations.put("autoscaling.knative.dev/min-scale", String.valueOf(minScale));
+
+        if (scaling.getStrategy() == null) {
+            return;
         }
-        if (maxScale != null) {
-            annotations.put("autoscaling.knative.dev/max-scale", String.valueOf(maxScale));
+
+        if (scaling.getStrategy().getType() == ScalingStrategyType.ACTIVE_REQUESTS) {
+            var target = scaling.getStrategy().getThreshold();
+            revisionSpecChain.data().setContainerConcurrency((long) target);
+            annotations.put("autoscaling.knative.dev/target", String.valueOf(target));
+            log.trace("Applied strategy ACTIVE_REQUESTS: target={} for deployment '{}'",
+                    scaling.getStrategy().getThreshold(), name);
+        } else {
+            throw new IllegalArgumentException("Scaling strategy '%s' is not supported. Supported strategies: %s"
+                    .formatted(scaling.getStrategy().getType(), SUPPORTED_SCALING_STRATEGIES));
         }
+    }
 
+    private void applyProgressDeadline(@Nullable ProbeProperties probeProperties,
+                                       MappingChain<RevisionTemplateSpec> template) {
         var progressDeadline = progressDeadlineCalculator.compute(probeProperties);
         if (progressDeadline != null) {
+            var annotations = template.get(KnativeMappers.SERVICE_TEMPLATE_METADATA_FIELD)
+                    .get(KnativeMappers.METADATA_ANNOTATIONS_FIELD).data();
             annotations.put("serving.knative.dev/progress-deadline", progressDeadline);
         }
-
-        templateMetadata.setAnnotations(annotations);
     }
 
     private EnvVarSource buildKnativeSecretRef(SensitiveEnvVar env) {

src/main/java/com/epam/aidial/deployment/manager/utils/mapping/KnativeMappers.java

@@ -10,7 +10,9 @@
 import lombok.experimental.UtilityClass;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @UtilityClass
 public class KnativeMappers {
@@ -35,6 +37,11 @@ public class KnativeMappers {
             RevisionTemplateSpec::getMetadata,
             RevisionTemplateSpec::setMetadata);
 
+    public static final FieldMapper<ObjectMeta, Map<String, String>> METADATA_ANNOTATIONS_FIELD = new FieldMapper<>(
+            HashMap::new,
+            ObjectMeta::getAnnotations,
+            ObjectMeta::setAnnotations);
+
     public static final FieldMapper<RevisionTemplateSpec, RevisionSpec> SERVICE_TEMPLATE_SPEC_FIELD = new FieldMapper<>(
             RevisionSpec::new,
             RevisionTemplateSpec::getSpec,

src/main/java/com/epam/aidial/deployment/manager/web/dto/DeploymentInfoDto.java

@@ -18,9 +18,6 @@ public record DeploymentInfoDto(
         @NotNull String displayName,
         @Nullable String description,
         @Nullable String author,
-        @Nullable Integer initialScale,
-        @Nullable Integer minScale,
-        @Nullable Integer maxScale,
         @Nullable ResourcesDto resources,
         @NotNull DeploymentStatusDto status,
         @Nullable String url,