nebulous/optimiser-controller
Code Issues Proposed changes

Deploy master node only on active clouds

Browse Source 
Change-Id: I58d502e2e6076cfd0bfa79638017cca3b7b1654d
This commit is contained in:
Rudi Schlatte 2024-05-30 14:34:12 +02:00
parent 44166c84a3
commit a4dcbb995b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nebulous-requirements-extractor/src/main/java/eu/nebulouscloud/optimiser/kubevela/KubevelaAnalyzer.java
View File

@ -88,7 +88,7 @@ public class KubevelaAnalyzer {
* @param reqs The list of requirements to add to.
* @param cloudIDs the Cloud IDs to filter for.
*/
private static void addNebulousRequirements(List<Requirement> reqs, Set<String> cloudIDs) {
public static void addNebulousRequirements(List<Requirement> reqs, Set<String> cloudIDs) {
reqs.add(new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "2048"));
if (cloudIDs != null && !cloudIDs.isEmpty()) {
reqs.add(new AttributeRequirement("cloud", "id",

14
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java
View File

@ -1,6 +1,7 @@
package eu.nebulouscloud.optimiser.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@ -39,10 +40,13 @@ public class NebulousAppDeployer {
* This machine runs the Kubernetes cluster and KubeVela. For
* now, we ask for 8GB memory and 4 cores.
*/
public static List<Requirement> getControllerRequirements(String jobID) {
return List.of(
new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "8192"),
new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4"));
public static List<Requirement> getControllerRequirements(String jobID, Set<String> cloudIDs) {
List<Requirement> reqs = new ArrayList<>(
Arrays.asList(
new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "8192"),
new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4")));
KubevelaAnalyzer.addNebulousRequirements(reqs, cloudIDs);
return reqs;
}
/**
@ -251,7 +255,7 @@ public class NebulousAppDeployer {
// Extract node requirements
Map<String, List<Requirement>> componentRequirements = KubevelaAnalyzer.getBoundedRequirements(kubevela, app.getCloudIDs());
Map<String, Integer> nodeCounts = KubevelaAnalyzer.getNodeCount(kubevela);
List<Requirement> controllerRequirements = getControllerRequirements(appUUID);
List<Requirement> controllerRequirements = getControllerRequirements(appUUID, app.getCloudIDs());
// // HACK: do this only when cloud id = nrec
// componentRequirements.forEach(
// (k, reqs) -> reqs.add(new AttributeRequirement("location", "name", RequirementOperator.EQ, "bgo")));