diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt index 995f35e2613036de4b3d50f797e4974a5ec7ba85..0110e1d7cdbbe150fc6d76bc303770b989f5d739 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt @@ -45,17 +45,12 @@ class KubernetesBenchmark : Benchmark { val resources = loadKubernetesResources(this.appResource + this.loadGenResource) val patcherFactory = PatcherFactory() - // patch the load dimension - load.getType().map { patcherDefinition -> patcherFactory.createPatcher(patcherDefinition, resources) } - .forEach { patcher -> patcher.patch(load.get().toString()) } - - // patch the resources - res.getType().map { patcherDefinition -> patcherFactory.createPatcher(patcherDefinition, resources) } - .forEach { patcher -> patcher.patch(res.get().toString()) } + // patch the load dimension the resources + load.getType().forEach { patcherDefinition -> patcherFactory.createPatcher(patcherDefinition, resources).patch(load.get().toString()) } + res.getType().forEach{ patcherDefinition -> patcherFactory.createPatcher(patcherDefinition, resources).patch(res.get().toString()) } // Patch the given overrides - configurationOverrides.forEach { override -> - patcherFactory.createPatcher(override.patcher, resources).patch(override.value) } + configurationOverrides.forEach { override -> patcherFactory.createPatcher(override.patcher, resources).patch(override.value) } return KubernetesBenchmarkDeployment( diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt index 79d6efe47fbe6bf40626a7135097c583d4699a59..82e4bc5d77f3f35d217c56a377513c0e7d329170 100644 --- a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt +++ b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt @@ -53,7 +53,6 @@ class ResourceLimitPatcherTest { k8sResource.spec.template.spec.containers.filter { it.name == defCPU.container } .forEach { - println(it) assertTrue(it.resources.limits["cpu"].toString() == cpuValue) assertTrue(it.resources.limits["memory"].toString() == memValue) } diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt index 9ca9a83aa96de1b141cfa5b97c0fab1c071a708c..3cd6b012f09c5471b1b011b5cd03e61a0fab1c4e 100644 --- a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt +++ b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt @@ -53,7 +53,6 @@ class ResourceRequestPatcherTest { k8sResource.spec.template.spec.containers.filter { it.name == defCPU.container } .forEach { - println(it) assertTrue(it.resources.requests["cpu"].toString() == cpuValue) assertTrue(it.resources.requests["memory"].toString() == memValue) }