Enhance crd benchmark schemata by adding an resources field, small enhancements

theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt

@@ -68,8 +68,8 @@ class TheodoliteController(
         try {
             val modifier = ConfigOverrideModifier(
             execution = execution,
-            resources = benchmark.loadKubernetesResources(benchmark.sut).map { it.first }
-                    + benchmark.loadKubernetesResources(benchmark.loadGenerator).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,

theodolite/src/test/kotlin/theodolite/execution/operator/BenchmarkCRDummy.kt

 package theodolite.execution.operator
 
 import theodolite.benchmark.KubernetesBenchmark
+import theodolite.benchmark.Resources
 import theodolite.model.crd.BenchmarkCRD
 import theodolite.util.KafkaConfig
 
@@ -24,9 +25,14 @@ class BenchmarkCRDummy(name: String) {
         benchmarkCR.kind = "Benchmark"
         benchmarkCR.apiVersion = "v1"
 
-        benchmark.infrastructure = emptyList()
-        benchmark.sut = emptyList()
-        benchmark.loadGenerator = emptyList()
+
+        benchmark.infrastructure = Resources()
+        benchmark.sut = Resources()
+        benchmark.loadGenerator = Resources()
+
+        benchmark.infrastructure.resources = emptyList()
+        benchmark.sut.resources = emptyList()
+        benchmark.loadGenerator.resources = emptyList()
 
         benchmark.resourceTypes = emptyList()
         benchmark.loadTypes = emptyList()

theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml

@@ -3,7 +3,6 @@ kind: benchmark
 metadata:
   name: example-benchmark
 spec:
-  infrastructure: []
   appResource:
     - "uc1-kstreams-deployment.yaml"
     - "aggregation-service.yaml"