Skip to content
Snippets Groups Projects

Resolve "Add application instance scaling support" -add api

Merged Patryk Kazimierowski requested to merge 254-add-scaling-api into develop
All threads resolved!
Files
16
@@ -16,10 +16,11 @@ import net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.en
import net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.entities.ServiceStorageVolume;
import net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.exceptions.KServiceManipulationException;
import net.geant.nmaas.orchestration.Identifier;
import net.geant.nmaas.orchestration.entities.AppDeployment;
import net.geant.nmaas.orchestration.repositories.DomainTechDetailsRepository;
import net.geant.nmaas.utils.bash.CommandExecutionException;
import net.geant.nmaas.utils.logging.LogLevel;
import net.geant.nmaas.utils.logging.Loggable;
import net.geant.nmaas.utils.bash.CommandExecutionException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -130,12 +131,12 @@ public class HelmKServiceManager implements KServiceLifecycleManager {
static Map<String, String> removeRedundantParameters(Map<String, String> additionalParameters) {
return additionalParameters.entrySet().stream().filter(entry ->
!entry.getKey().contains(RANDOM_ARGUMENT_EXPRESSION_PREFIX)
&& !entry.getKey().contains(PUBLIC_ACCESS_SELECTOR_ARGUMENT_EXPRESSION_PREFIX)
).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
!entry.getKey().contains(RANDOM_ARGUMENT_EXPRESSION_PREFIX)
&& !entry.getKey().contains(PUBLIC_ACCESS_SELECTOR_ARGUMENT_EXPRESSION_PREFIX)
).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
private Map<String, String> getIngressVariables(IngressResourceConfigOption ingressResourceConfigOption, Set<ServiceAccessMethod> externalAccessMethods, String domain){
private Map<String, String> getIngressVariables(IngressResourceConfigOption ingressResourceConfigOption, Set<ServiceAccessMethod> externalAccessMethods, String domain) {
return HelmChartVariables.ingressVariablesMap(
DEPLOY_FROM_CHART.equals(ingressResourceConfigOption),
externalAccessMethods,
@@ -147,7 +148,7 @@ public class HelmKServiceManager implements KServiceLifecycleManager {
);
}
private String getIngressClass(String domain){
private String getIngressClass(String domain) {
if (Boolean.TRUE.equals(ingressManager.getIngressPerDomain())) {
return domainTechDetailsRepository.findByDomainCodename(domain).orElseThrow(() -> new IllegalArgumentException("DomainTechDetails cannot be found for domain " + domain)).getKubernetesIngressClass();
}
@@ -207,4 +208,9 @@ public class HelmKServiceManager implements KServiceLifecycleManager {
}
}
@Override
@Loggable(LogLevel.TRACE)
public void scaleDeployment(Identifier deploymentId, int replicas) {
}
}
\ No newline at end of file
Loading