nebulous/optimiser-controller
Code Issues Proposed changes

Ask for Ubuntu version 22

Browse Source 
Change-Id: I3fbac79b3bf99147f22cc1de2550aaf243fb2d85
This commit is contained in:
Rudi Schlatte 2024-04-03 21:47:48 +02:00
parent 252d818c92
commit e806f3e5ea
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,8 +118,12 @@ public class KubevelaAnalyzer {
String componentName = c.get("name").asText(); String componentName = c.get("name").asText();
ArrayList<Requirement> reqs = new ArrayList<>(); ArrayList<Requirement> reqs = new ArrayList<>();
if (includeNebulousRequirements) { if (includeNebulousRequirements) {
// We want Ubuntu, version 22.04, and 2GB of RAM until we know
// more about the size / cpu requirements of the nebulous
// runtime.
reqs.add(new AttributeRequirement("image", "operatingSystem.family", reqs.add(new AttributeRequirement("image", "operatingSystem.family",
RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString())); RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString()));
reqs.add(new AttributeRequirement("image", "name", RequirementOperator.INC, "22"));
reqs.add(new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "2048")); reqs.add(new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "2048"));
} }
JsonNode cpu = c.at("/properties/cpu"); JsonNode cpu = c.at("/properties/cpu");

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

@ -47,6 +47,7 @@ public class NebulousAppDeployer {
return List.of( return List.of(
new AttributeRequirement("image", "operatingSystem.family", new AttributeRequirement("image", "operatingSystem.family",
RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString()), RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString()),
new AttributeRequirement("image", "name", RequirementOperator.INC, "22"),
new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "8192"), new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "8192"),
new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4")); new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4"));
} }