Adding mem and cpu requests/limits

Author: fmichielssen

pom.xml

@@ -177,7 +177,7 @@
 		<dependency>
 			<groupId>com.spotify</groupId>
 			<artifactId>docker-client</artifactId>
-			<version>8.11.2</version>
+			<version>8.15.2</version>
 		</dependency>
 		<!-- Jersey, a dependency of docker-client with wonky version constraints -->
 		<dependency>

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

@@ -58,9 +58,17 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 		}
 		hostConfigBuilder.portBindings(portBindings);
 
-		Optional.ofNullable(memoryToBytes(spec.getMemory())).ifPresent(l -> hostConfigBuilder.memory(l));
-		Optional.ofNullable(spec.getNetwork()).ifPresent(n -> hostConfigBuilder.networkMode(spec.getNetwork()));
+		hostConfigBuilder.memoryReservation(memoryToBytes(spec.getMemoryRequest()));
+		hostConfigBuilder.memory(memoryToBytes(spec.getMemoryLimit()));
+		if (spec.getCpuLimit() != null) {
+			// Workaround, see https://github.com/spotify/docker-client/issues/959
+			long period = 100000;
+			long quota = (long) (period * Float.parseFloat(spec.getCpuLimit()));
+			hostConfigBuilder.cpuPeriod(period);
+			hostConfigBuilder.cpuQuota(quota);
+		}
 
+		Optional.ofNullable(spec.getNetwork()).ifPresent(n -> hostConfigBuilder.networkMode(spec.getNetwork()));
 		Optional.ofNullable(spec.getDns()).ifPresent(dns -> hostConfigBuilder.dns(dns));
 		Optional.ofNullable(spec.getVolumes()).ifPresent(v -> hostConfigBuilder.binds(v));
 		hostConfigBuilder.privileged(spec.isPrivileged());

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -36,9 +36,10 @@
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Splitter;
 import org.apache.commons.io.IOUtils;
 
+import com.google.common.base.Splitter;
+
 import eu.openanalytics.containerproxy.ContainerProxyException;
 import eu.openanalytics.containerproxy.backend.AbstractContainerBackend;
 import eu.openanalytics.containerproxy.model.runtime.Container;
@@ -54,6 +55,8 @@
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodSpec;
+import io.fabric8.kubernetes.api.model.Quantity;
+import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder;
 import io.fabric8.kubernetes.api.model.SecretKeySelectorBuilder;
 import io.fabric8.kubernetes.api.model.SecurityContext;
 import io.fabric8.kubernetes.api.model.SecurityContextBuilder;
@@ -165,6 +168,12 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 				.withPrivileged(spec.isPrivileged())
 				.build();
 
+		ResourceRequirementsBuilder resourceRequirementsBuilder = new ResourceRequirementsBuilder();
+		resourceRequirementsBuilder.addToRequests("cpu", Optional.ofNullable(spec.getCpuRequest()).map(s -> new Quantity(s)).orElse(null));
+		resourceRequirementsBuilder.addToLimits("cpu", Optional.ofNullable(spec.getCpuLimit()).map(s -> new Quantity(s)).orElse(null));
+		resourceRequirementsBuilder.addToRequests("memory", Optional.ofNullable(spec.getMemoryRequest()).map(s -> new Quantity(s)).orElse(null));
+		resourceRequirementsBuilder.addToLimits("memory", Optional.ofNullable(spec.getMemoryLimit()).map(s -> new Quantity(s)).orElse(null));
+		
 		List<ContainerPort> containerPorts = spec.getPortMapping().values().stream()
 				.map(p -> new ContainerPortBuilder().withContainerPort(p).build())
 				.collect(Collectors.toList());
@@ -176,6 +185,7 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 				.withPorts(containerPorts)
 				.withVolumeMounts(volumeMounts)
 				.withSecurityContext(security)
+				.withResources(resourceRequirementsBuilder.build())
 				.withEnv(envVars);
 
 		String imagePullPolicy = getProperty(PROPERTY_IMG_PULL_POLICY);

src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java

@@ -35,8 +35,11 @@ public class ContainerSpec {
 	private String[] dns;
 	private String[] volumes;
 	private Map<String, Integer> portMapping = new HashMap<>();
-	private String memory;
 	private boolean privileged;
+	private String memoryRequest;
+	private String memoryLimit;
+	private String cpuRequest;
+	private String cpuLimit;
 	private Map<String, String> settings = new HashMap<>();
 
 	public String getImage() {
@@ -93,18 +96,36 @@ public Map<String, Integer> getPortMapping() {
 	public void setPortMapping(Map<String, Integer> portMapping) {
 		this.portMapping = portMapping;
 	}
-	public String getMemory() {
-		return memory;
-	}
-	public void setMemory(String memory) {
-		this.memory = memory;
-	}
 	public boolean isPrivileged() {
 		return privileged;
 	}
 	public void setPrivileged(boolean privileged) {
 		this.privileged = privileged;
 	}
+	public String getMemoryRequest() {
+		return memoryRequest;
+	}
+	public void setMemoryRequest(String memoryRequest) {
+		this.memoryRequest = memoryRequest;
+	}
+	public String getMemoryLimit() {
+		return memoryLimit;
+	}
+	public void setMemoryLimit(String memoryLimit) {
+		this.memoryLimit = memoryLimit;
+	}
+	public String getCpuRequest() {
+		return cpuRequest;
+	}
+	public void setCpuRequest(String cpuRequest) {
+		this.cpuRequest = cpuRequest;
+	}
+	public String getCpuLimit() {
+		return cpuLimit;
+	}
+	public void setCpuLimit(String cpuLimit) {
+		this.cpuLimit = cpuLimit;
+	}
 	public Map<String, String> getSettings() {
 		return settings;
 	}
@@ -128,7 +149,10 @@ public void copy(ContainerSpec target) {
 			if (target.getPortMapping() == null) target.setPortMapping(new HashMap<>());
 			target.getPortMapping().putAll(portMapping);
 		}
-		target.setMemory(memory);
+		target.setMemoryRequest(memoryRequest);
+		target.setMemoryLimit(memoryLimit);
+		target.setCpuRequest(cpuRequest);
+		target.setCpuLimit(cpuLimit);
 		target.setPrivileged(privileged);
 		if (settings != null) {
 			if (target.getSettings() == null) target.setSettings(new HashMap<>());

src/main/java/eu/openanalytics/containerproxy/spec/expression/ExpressionAwareContainerSpec.java

@@ -77,8 +77,17 @@ public String[] getVolumes() {
 	public Map<String, Integer> getPortMapping() {
 		return source.getPortMapping();
 	}
-	public String getMemory() {
-		return resolve(source.getMemory());
+	public String getMemoryRequest() {
+		return resolve(source.getMemoryRequest());
+	}
+	public String getMemoryLimit() {
+		return resolve(source.getMemoryLimit());
+	}
+	public String getCpuRequest() {
+		return resolve(source.getCpuRequest());
+	}
+	public String getCpuLimit() {
+		return resolve(source.getCpuLimit());
 	}
 	public boolean isPrivileged() {
 		return source.isPrivileged();