seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Gh17540 memory request dockerimage (#18592) 

Signed-off-by: Michal Vala <mvala@redhat.com>
7.24.x
Michal Vala 2020-12-11 13:11:47 +01:00 committed by GitHub
parent d32c830250
commit 6c987dadac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplier.java
View File

@ -172,6 +172,7 @@ public class DockerimageComponentToWorkspaceApplier implements ComponentToWorksp
buildDeployment(
machineName,
dockerimageComponent.getImage(),
dockerimageComponent.getMemoryRequest(),
dockerimageComponent.getMemoryLimit(),
dockerimageComponent.getCpuRequest(),
dockerimageComponent.getCpuLimit(),
@ -190,6 +191,7 @@ public class DockerimageComponentToWorkspaceApplier implements ComponentToWorksp
private Deployment buildDeployment(
String name,
String image,
String memoryRequest,
String memoryLimit,
String cpuRequest,
String cpuLimit,
@ -207,6 +209,9 @@ public class DockerimageComponentToWorkspaceApplier implements ComponentToWorksp
.build();
Containers.addRamLimit(container, memoryLimit);
if (!isNullOrEmpty(memoryRequest)) {
Containers.addRamRequest(container, memoryRequest);
}
if (!isNullOrEmpty(cpuRequest)) {
Containers.addCpuRequest(container, KubernetesSize.toCores(cpuRequest));
}

7
infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/DockerimageComponentToWorkspaceApplierTest.java
View File

@ -243,13 +243,14 @@ public class DockerimageComponentToWorkspaceApplierTest {
}
@Test
public void shouldProvisionContainerWithMemoryLimitSpecified() throws Exception {
public void shouldProvisionContainerWithMemoryResourcesSpecified() throws Exception {
// given
ComponentImpl dockerimageComponent = new ComponentImpl();
dockerimageComponent.setAlias("jdk");
dockerimageComponent.setType(DOCKERIMAGE_COMPONENT_TYPE);
dockerimageComponent.setImage("eclipse/ubuntu_jdk8:latest");
dockerimageComponent.setMemoryLimit("1G");
dockerimageComponent.setMemoryRequest("128M");
// when
dockerimageComponentApplier.apply(workspaceConfig, dockerimageComponent, null);
@ -271,6 +272,10 @@ public class DockerimageComponentToWorkspaceApplierTest {
Quantity memoryLimit = container.getResources().getLimits().get("memory");
assertEquals(memoryLimit.getAmount(), "1");
assertEquals(memoryLimit.getFormat(), "G");
Quantity memoryRequest = container.getResources().getRequests().get("memory");
assertEquals(memoryRequest.getAmount(), "128");
assertEquals(memoryRequest.getFormat(), "M");
}
@Test

98
wsmaster/che-core-api-workspace/src/main/resources/schema/1.0.0/devfile.json
View File

@ -247,46 +247,10 @@
"examples": [
"https://che-plugin-registry.openshift.io/v3/"
]
},
"memoryLimit": {
"anyOf": [
{
"type": "string"
},
{
"type": "integer",
"exclusiveMinimum": 0
}
],
"description": "Describes memory limit for the component. You can express memory as a plain integer or as a fixed-point integer using one of these suffixes: E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki",
"examples": [
"128974848",
"129e6",
"129M",
"123Mi"
]
},
"memoryRequest": {
"anyOf": [
{
"type": "string"
},
{
"type": "integer",
"exclusiveMinimum": 0
}
],
"description": "Describes memory request for the component. You can express memory as a plain integer or as a fixed-point integer using one of these suffixes: E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki",
"examples": [
"128974848",
"129e6",
"129M",
"123Mi"
]
}
}
}
},
}
},
{
"if": {
"properties": {
@ -349,7 +313,7 @@
"{\"java.home\": \"/home/user/jdk11\", \"java.jdt.ls.vmargs\": \"-Xmx1G\"}"
],
"additionalProperties": {
"anyOf" : [
"anyOf": [
{
"type": [
"boolean",
@ -500,24 +464,8 @@
"automountWorkspaceSecrets": {},
"volumes": {},
"endpoints": {},
"memoryLimit": {
"anyOf": [
{
"type": "string"
},
{
"type": "integer",
"exclusiveMinimum": 0
}
],
"description": "Describes memory limit for the component. You can express memory as a plain integer or as a fixed-point integer using one of these suffixes: E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki",
"examples": [
"128974848",
"129e6",
"129M",
"123Mi"
]
},
"memoryLimit": {},
"memoryRequest": {},
"image": {
"type": "string",
"description": "Specifies the docker image that should be used for component",
@ -582,6 +530,42 @@
"description": "Describes whether projects sources should be mount to the component. `CHE_PROJECTS_ROOT` environment variable should contains a path where projects sources are mount",
"default": "false"
},
"memoryLimit": {
"anyOf": [
{
"type": "string"
},
{
"type": "integer",
"exclusiveMinimum": 0
}
],
"description": "Describes memory limit for the component. You can express memory as a plain integer or as a fixed-point integer using one of these suffixes: E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki",
"examples": [
"128974848",
"129e6",
"129M",
"123Mi"
]
},
"memoryRequest": {
"anyOf": [
{
"type": "string"
},
{
"type": "integer",
"exclusiveMinimum": 0
}
],
"description": "Describes memory request for the component. You can express memory as a plain integer or as a fixed-point integer using one of these suffixes: E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki",
"examples": [
"128974848",
"129e6",
"129M",
"123Mi"
]
},
"cpuLimit": {
"anyOf": [
{

1
wsmaster/che-core-api-workspace/src/test/resources/devfile/schema_test/dockerimage_component/devfile_dockerimage_component.yaml
View File

@ -32,6 +32,7 @@ components:
public: 'true'
discoverable: 'false'
memoryLimit: 1536M
memoryRequest: 512M
cpuLimit: 1.5
cpuRequest: 750m
command: ['/bin/sh']