From 40427da4956a28bc5c4fb80affeb6393b34992e9 Mon Sep 17 00:00:00 2001 From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de> Date: Wed, 24 Nov 2021 19:01:22 +0100 Subject: [PATCH] clean up --- .../theodolite/execution/operator/TheodoliteController.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt b/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt index 6933fb163..70e30cf84 100644 --- a/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt +++ b/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt @@ -72,8 +72,8 @@ class TheodoliteController( try { val modifier = ConfigOverrideModifier( execution = execution, - resources = benchmark.loadKubernetesResources(benchmark.sut.resources !!).map { it.first } - + benchmark.loadKubernetesResources(benchmark.loadGenerator.resources !!).map { it.first } + resources = benchmark.loadKubernetesResources(benchmark.sut.resources).map { it.first } + + benchmark.loadKubernetesResources(benchmark.loadGenerator.resources).map { it.first } ) modifier.setAdditionalLabels( labelValue = execution.name, @@ -186,7 +186,6 @@ class TheodoliteController( benchmarkStateHandler.setResourceSetState(resource.spec.name, state) } - // TODO(Should we check, if actions could be performed or not (all pods are up and running...))? private fun checkResource(benchmark: KubernetesBenchmark): BenchmarkStates { return try { val appResources = -- GitLab