Specify kubernetes memory limits in bytes when memory is configured on elastic profile (#12)

Author: GaneshSPatil

src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java

@@ -58,23 +58,7 @@ private KubernetesInstance create(CreateAgentRequest request, PluginSettings set
         container.setImage(image(request.properties()));
         container.setImagePullPolicy("IfNotPresent");
 
-        ResourceRequirements resources = new ResourceRequirements();
-        resources.setLimits(new HashMap<String, Quantity>() {{
-            String maxMemory = request.properties().get("MaxMemory");
-            if (StringUtils.isNotBlank(maxMemory)) {
-                LOG.debug(String.format("[Create Agent] Setting memory resource limit on k8s pod:%s", maxMemory));
-                Size mem = Size.parse(maxMemory);
-                put("memory", new Quantity(String.valueOf(mem.toMegabytes()), "Mi"));
-            }
-
-            String maxCPU = request.properties().get("MaxCPU");
-            if (StringUtils.isNotBlank(maxCPU)) {
-                LOG.debug(String.format("[Create Agent] Setting cpu resource limit on k8s pod:%s", maxCPU));
-                put("cpu", new Quantity(maxCPU));
-            }
-        }});
-
-        container.setResources(resources);
+        container.setResources(getPodResources(request));
 
         ObjectMeta podMetadata = new ObjectMeta();
         podMetadata.setName(containerName);
@@ -91,6 +75,28 @@ private KubernetesInstance create(CreateAgentRequest request, PluginSettings set
         return createKubernetesPod(client, elasticAgentPod);
     }
 
+    private ResourceRequirements getPodResources(CreateAgentRequest request) {
+        ResourceRequirements resources = new ResourceRequirements();
+        HashMap<String, Quantity> limits = new HashMap<>();
+
+        String maxMemory = request.properties().get("MaxMemory");
+        if (StringUtils.isNotBlank(maxMemory)) {
+            Size mem = Size.parse(maxMemory);
+            LOG.debug(String.format("[Create Agent] Setting memory resource limit on k8s pod:%s", new Quantity(String.valueOf(mem.toMegabytes()), "M")));
+            limits.put("memory", new Quantity(String.valueOf(mem.toBytes())));
+        }
+
+        String maxCPU = request.properties().get("MaxCPU");
+        if (StringUtils.isNotBlank(maxCPU)) {
+            LOG.debug(String.format("[Create Agent] Setting cpu resource limit on k8s pod:%s", new Quantity(maxCPU)));
+            limits.put("cpu", new Quantity(maxCPU));
+        }
+
+        resources.setLimits(limits);
+
+        return resources;
+    }
+
     private static void setLabels(Pod pod, CreateAgentRequest request) {
         Map<String, String> existingLabels = (pod.getMetadata().getLabels() != null) ? pod.getMetadata().getLabels() : new HashMap<>();
         existingLabels.putAll(labelsFrom(request));

src/test/java/cd/go/contrib/elasticagent/CreateAgentRequestMother.java

@@ -27,8 +27,8 @@ public static CreateAgentRequest defaultCreateAgentRequest() {
         String autoRegisterKey = UUID.randomUUID().toString();
         HashMap<String, String> properties = new HashMap<>();
         properties.put("Image", "gocd/custom-gocd-agent-alpine");
-        properties.put("MaxMemory", "1024m");
-        properties.put("MaxCPU", "1");
+        properties.put("MaxMemory", "1024M");
+        properties.put("MaxCPU", "2");
         properties.put("Environment", "ENV1=VALUE1\n" +
                 "ENV2=VALUE2");
         properties.put("PodConfiguration", "");

src/test/java/cd/go/contrib/elasticagent/KubernetesAgentInstancesIntegrationTest.java

@@ -18,10 +18,7 @@
 
 import cd.go.contrib.elasticagent.requests.CreateAgentRequest;
 import com.google.gson.Gson;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.EnvVar;
-import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.api.model.PodList;
+import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.internal.NodeOperationsImpl;
 import io.fabric8.kubernetes.client.dsl.internal.PodOperationsImpl;
@@ -102,6 +99,24 @@ public void shouldCreateKubernetesPodWithContainerSpecification() throws Excepti
         assertThat(gocdAgentContainer.getImagePullPolicy(), is("IfNotPresent"));
     }
 
+    @Test
+    public void shouldCreateKubernetesPodWithResourcesLimitSpecificationOnGoCDAgentContainer() throws Exception {
+        ArgumentCaptor<Pod> argumentCaptor = ArgumentCaptor.forClass(Pod.class);
+        kubernetesAgentInstances.create(createAgentRequest, settings, mockedPluginRequest);
+        verify(pods).create(argumentCaptor.capture());
+        Pod elasticAgentPod = argumentCaptor.getValue();
+
+        List<Container> containers = elasticAgentPod.getSpec().getContainers();
+        assertThat(containers.size(), is(1));
+
+        Container gocdAgentContainer = containers.get(0);
+
+        ResourceRequirements resources = gocdAgentContainer.getResources();
+
+        assertThat(resources.getLimits().get("memory").getAmount(), is(String.valueOf(1024 * 1024 * 1024)));
+        assertThat(resources.getLimits().get("cpu").getAmount(), is("2"));
+    }
+
     @Test
     public void shouldCreateKubernetesPodWithPodMetadata() throws Exception {
         ArgumentCaptor<Pod> argumentCaptor = ArgumentCaptor.forClass(Pod.class);
@@ -281,4 +296,4 @@ public void usingPodYamlConfigurations_shouldCreateKubernetesPodWithPodLabels()
         assertThat(elasticAgentPod.getMetadata().getLabels(), is(labels));
     }
 
-}
+}