diff --git a/nebulous-requirements-extractor/src/main/java/eu/nebulouscloud/optimiser/kubevela/KubevelaAnalyzer.java b/nebulous-requirements-extractor/src/main/java/eu/nebulouscloud/optimiser/kubevela/KubevelaAnalyzer.java index 3fd4a58..fdb62d0 100644 --- a/nebulous-requirements-extractor/src/main/java/eu/nebulouscloud/optimiser/kubevela/KubevelaAnalyzer.java +++ b/nebulous-requirements-extractor/src/main/java/eu/nebulouscloud/optimiser/kubevela/KubevelaAnalyzer.java @@ -118,8 +118,12 @@ public class KubevelaAnalyzer { String componentName = c.get("name").asText(); ArrayList reqs = new ArrayList<>(); 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", RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString())); + reqs.add(new AttributeRequirement("image", "name", RequirementOperator.INC, "22")); reqs.add(new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "2048")); } JsonNode cpu = c.at("/properties/cpu"); diff --git a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java index 71cb606..56e5e4b 100644 --- a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java +++ b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/NebulousAppDeployer.java @@ -47,6 +47,7 @@ public class NebulousAppDeployer { return List.of( new AttributeRequirement("image", "operatingSystem.family", RequirementOperator.IN, OperatingSystemFamily.UBUNTU.toString()), + new AttributeRequirement("image", "name", RequirementOperator.INC, "22"), new AttributeRequirement("hardware", "ram", RequirementOperator.GEQ, "8192"), new AttributeRequirement("hardware", "cores", RequirementOperator.GEQ, "4")); }