diff --git a/helm/templates/theodolite/crd-benchmark.yaml b/helm/templates/theodolite/crd-benchmark.yaml
index 3d7b46b4608ca9bdbeb1c75f5fc766c978f40301..c2eb8d0d355578d5c247c4e4ce622c8764d71cb4 100644
--- a/helm/templates/theodolite/crd-benchmark.yaml
+++ b/helm/templates/theodolite/crd-benchmark.yaml
@@ -128,6 +128,9 @@ spec:
type: array
items:
type: object
+ oneOf:
+ - required: [configMap]
+ - required: [fileSystem]
properties:
configMap:
type: object
@@ -151,6 +154,9 @@ spec:
type: array
items:
type: object
+ oneOf:
+ - required: [configMap]
+ - required: [fileSystem]
properties:
configMap:
type: object
diff --git a/theodolite-benchmarks/definitions/install-configmaps.sh b/theodolite-benchmarks/definitions/install-configmaps.sh
index 7ddd606a162185993ce402ef4d3b84d8d00eb82c..c5c0283f434d7a4c13da0e93a855cef7e112bbb9 100755
--- a/theodolite-benchmarks/definitions/install-configmaps.sh
+++ b/theodolite-benchmarks/definitions/install-configmaps.sh
@@ -1,8 +1,17 @@
+# flink
kubectl create configmap benchmark-resources-uc1-flink --from-file uc1-flink/resources
kubectl create configmap benchmark-resources-uc2-flink --from-file uc2-flink/resources
kubectl create configmap benchmark-resources-uc3-flink --from-file uc3-flink/resources
kubectl create configmap benchmark-resources-uc4-flink --from-file uc4-flink/resources
+
+# kafka
kubectl create configmap benchmark-resources-uc1-kstreams --from-file uc1-kstreams/resources
kubectl create configmap benchmark-resources-uc2-kstreams --from-file uc2-kstreams/resources
kubectl create configmap benchmark-resources-uc3-kstreams --from-file uc3-kstreams/resources
-kubectl create configmap benchmark-resources-uc4-kstreams --from-file uc4-kstreams/resources
\ No newline at end of file
+kubectl create configmap benchmark-resources-uc4-kstreams --from-file uc4-kstreams/resources
+
+# load generator
+kubectl create configmap benchmark-resources-uc1-loadgen --from-file uc1-loadGen
+kubectl create configmap benchmark-resources-uc2-loadgen --from-file uc2-loadGen
+kubectl create configmap benchmark-resources-uc3-loadgen --from-file uc3-loadGen
+kubectl create configmap benchmark-resources-uc4-loadgen --from-file uc4-loadGen
\ No newline at end of file
diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
index 3e16e486446d568d2cac0fe5196ab7446be25978..070a2cd89b64fde8fc462709112e2af1f1e79544 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
@@ -3,17 +3,23 @@ kind: benchmark
metadata:
name: uc1-flink
spec:
- appResource:
- - "uc1-flink/flink-configuration-configmap.yaml"
- - "uc1-flink/taskmanager-deployment.yaml"
- - "uc1-flink/taskmanager-service.yaml"
- - "uc1-flink/service-monitor.yaml"
- - "uc1-flink/jobmanager-service.yaml"
- - "uc1-flink/jobmanager-deployment.yaml"
- #- "uc1-flink/jobmanager-rest-service.yaml"
- loadGenResource:
- - "uc1-kstreams/uc1-load-generator-deployment.yaml"
- - "uc1-kstreams/uc1-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc1-flink"
+ files:
+ - "uc1-flink/flink-configuration-configmap.yaml"
+ - "uc1-flink/taskmanager-deployment.yaml"
+ - "uc1-flink/taskmanager-service.yaml"
+ - "uc1-flink/service-monitor.yaml"
+ - "uc1-flink/jobmanager-service.yaml"
+ - "uc1-flink/jobmanager-deployment.yaml"
+ #- "uc1-flink/jobmanager-rest-service.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc1-loadgen"
+ files:
+ - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ - "uc1-kstreams/uc1-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
index 8bcc7d5a1d750eed140527e7c6176a881bc9e6e1..283b3baa53b2090b445a379641086f2dc6c7753e 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
@@ -3,14 +3,20 @@ kind: benchmark
metadata:
name: uc1-kstreams
spec:
- appResource:
- - "uc1-kstreams/uc1-kstreams-deployment.yaml"
- - "uc1-kstreams/uc1-kstreams-service.yaml"
- - "uc1-kstreams/uc1-jmx-configmap.yaml"
- - "uc1-kstreams/uc1-service-monitor.yaml"
- loadGenResource:
- - "uc1-kstreams/uc1-load-generator-deployment.yaml"
- - "uc1-kstreams/uc1-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc1-kstreams"
+ files:
+ - "uc1-kstreams/uc1-kstreams-deployment.yaml"
+ - "uc1-kstreams/uc1-kstreams-service.yaml"
+ - "uc1-kstreams/uc1-jmx-configmap.yaml"
+ - "uc1-kstreams/uc1-service-monitor.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc1-loadgen"
+ files:
+ - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ - "uc1-kstreams/uc1-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
index 871210c213b70070e2aae8f4986058763be74b7e..b90edf5e4dcae0a4f338fb5edb90c73f34b3d14b 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
@@ -1,12 +1,18 @@
name: "uc1-kstreams"
-appResource:
- - "uc1-kstreams-deployment.yaml"
- - "uc1-kstreams-service.yaml"
- - "uc1-jmx-configmap.yaml"
- - "uc1-service-monitor.yaml"
-loadGenResource:
- - "uc1-load-generator-deployment.yaml"
- - "uc1-load-generator-service.yaml"
+appResourceSet:
+ - configMap:
+ name: "benchmark-resources-uc1-kstreams"
+ files:
+ - "uc1-kstreams/uc1-kstreams-deployment.yaml"
+ - "uc1-kstreams/uc1-kstreams-service.yaml"
+ - "uc1-kstreams/uc1-jmx-configmap.yaml"
+ - "uc1-kstreams/uc1-service-monitor.yaml"
+loadGenResourceSet:
+ - configMap:
+ name: "benchmark-resources-uc1-loadgen"
+ files:
+ - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ - "uc1-kstreams/uc1-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc1-loadGen/uc1-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
index ab335cc4f9f8413dd7871fc2184491235aad67e4..dcbdf57efe7397d2a7b646b6388550e205f39957 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -3,17 +3,23 @@ kind: benchmark
metadata:
name: uc2-flink
spec:
- appResource:
- - "uc2-flink/flink-configuration-configmap.yaml"
- - "uc2-flink/taskmanager-deployment.yaml"
- - "uc2-flink/taskmanager-service.yaml"
- - "uc2-flink/service-monitor.yaml"
- - "uc2-flink/jobmanager-service.yaml"
- - "uc2-flink/jobmanager-deployment.yaml"
- #- "uc2-flink/jobmanager-rest-service.yaml"
- loadGenResource:
- - "uc2-kstreams/uc2-load-generator-deployment.yaml"
- - "uc2-kstreams/uc2-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc2-flink"
+ files:
+ - "uc2-flink/flink-configuration-configmap.yaml"
+ - "uc2-flink/taskmanager-deployment.yaml"
+ - "uc2-flink/taskmanager-service.yaml"
+ - "uc2-flink/service-monitor.yaml"
+ - "uc2-flink/jobmanager-service.yaml"
+ - "uc2-flink/jobmanager-deployment.yaml"
+ #- "uc2-flink/jobmanager-rest-service.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc2-loadgen"
+ files:
+ - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ - "uc2-kstreams/uc2-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
index c71318c95ceb9d462f64e19b135ce59b43b03099..aaf479ae89329cabb1180925bb8984b25f40aa48 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
@@ -3,14 +3,20 @@ kind: benchmark
metadata:
name: uc2-kstreams
spec:
- appResource:
- - "uc2-kstreams/uc2-kstreams-deployment.yaml"
- - "uc2-kstreams/uc2-kstreams-service.yaml"
- - "uc2-kstreams/uc2-jmx-configmap.yaml"
- - "uc2-kstreams/uc2-service-monitor.yaml"
- loadGenResource:
- - "uc2-kstreams/uc2-load-generator-deployment.yaml"
- - "uc2-kstreams/uc2-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc2-kstreams"
+ files:
+ - "uc2-kstreams/uc2-kstreams-deployment.yaml"
+ - "uc2-kstreams/uc2-kstreams-service.yaml"
+ - "uc2-kstreams/uc2-jmx-configmap.yaml"
+ - "uc2-kstreams/uc2-service-monitor.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc2-loadgen"
+ files:
+ - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ - "uc2-kstreams/uc2-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
index 48269b38a086f074ead80964df3bd4633742743e..b0dbd6bf26b1751add491836a76580e5ce980611 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
@@ -1,12 +1,18 @@
name: "uc2-kstreams"
-appResource:
- - "uc2-kstreams-deployment.yaml"
- - "uc2-kstreams-service.yaml"
- - "uc2-jmx-configmap.yaml"
- - "uc2-service-monitor.yaml"
-loadGenResource:
- - "uc2-load-generator-deployment.yaml"
- - "uc2-load-generator-service.yaml"
+appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc2-kstreams"
+ files:
+ - "uc2-kstreams/uc2-kstreams-deployment.yaml"
+ - "uc2-kstreams/uc2-kstreams-service.yaml"
+ - "uc2-kstreams/uc2-jmx-configmap.yaml"
+ - "uc2-kstreams/uc2-service-monitor.yaml"
+loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc2-loadgen"
+ files:
+ - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ - "uc2-kstreams/uc2-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc2-loadGen/uc2-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
index bc881d83d622f49409c4b2023b7fd9445038c2e8..7ba17f8e4dee447e7adda0f7c3d0e16eb01f35c5 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
@@ -3,17 +3,23 @@ kind: benchmark
metadata:
name: uc3-flink
spec:
- appResource:
- - "uc3-flink/flink-configuration-configmap.yaml"
- - "uc3-flink/taskmanager-deployment.yaml"
- - "uc3-flink/taskmanager-service.yaml"
- - "uc3-flink/service-monitor.yaml"
- - "uc3-flink/jobmanager-service.yaml"
- - "uc3-flink/jobmanager-deployment.yaml"
- #- "uc3-flink/jobmanager-rest-service.yaml"
- loadGenResource:
- - "uc3-kstreams/uc3-load-generator-deployment.yaml"
- - "uc3-kstreams/uc3-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc3-flink"
+ files:
+ - "uc3-flink/flink-configuration-configmap.yaml"
+ - "uc3-flink/taskmanager-deployment.yaml"
+ - "uc3-flink/taskmanager-service.yaml"
+ - "uc3-flink/service-monitor.yaml"
+ - "uc3-flink/jobmanager-service.yaml"
+ - "uc3-flink/jobmanager-deployment.yaml"
+ #- "uc3-flink/jobmanager-rest-service.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc3-loadgen"
+ files:
+ - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ - "uc3-kstreams/uc3-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
index cc10020b17c7a31b61f5fdaf6963be9fda75865f..ef49aac8bcfbe5d3798982689fc73b540d0aade7 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
@@ -3,14 +3,20 @@ kind: benchmark
metadata:
name: uc3-kstreams
spec:
- appResource:
- - "uc3-kstreams/uc3-kstreams-deployment.yaml"
- - "uc3-kstreams/uc3-kstreams-service.yaml"
- - "uc3-kstreams/uc3-jmx-configmap.yaml"
- - "uc3-kstreams/uc3-service-monitor.yaml"
- loadGenResource:
- - "uc3-kstreams/uc3-load-generator-deployment.yaml"
- - "uc3-kstreams/uc3-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc3-kstreams"
+ files:
+ - "uc3-kstreams/uc3-kstreams-deployment.yaml"
+ - "uc3-kstreams/uc3-kstreams-service.yaml"
+ - "uc3-kstreams/uc3-jmx-configmap.yaml"
+ - "uc3-kstreams/uc3-service-monitor.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc3-loadgen"
+ files:
+ - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ - "uc3-kstreams/uc3-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
index 0c2311388f1dfa87e8a182eb8399020bc83ae4ce..8bb0b6733bc474d224def09cf22b0315c050b5dd 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
@@ -1,12 +1,18 @@
name: "uc3-kstreams"
-appResource:
- - "uc3-kstreams-deployment.yaml"
- - "uc3-kstreams-service.yaml"
- - "uc3-jmx-configmap.yaml"
- - "uc3-service-monitor.yaml"
-loadGenResource:
- - "uc3-load-generator-deployment.yaml"
- - "uc3-load-generator-service.yaml"
+appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc3-kstreams"
+ files:
+ - "uc3-kstreams/uc3-kstreams-deployment.yaml"
+ - "uc3-kstreams/uc3-kstreams-service.yaml"
+ - "uc3-kstreams/uc3-jmx-configmap.yaml"
+ - "uc3-kstreams/uc3-service-monitor.yaml"
+loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc3-loadgen"
+ files:
+ - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ - "uc3-kstreams/uc3-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc3-loadGen/uc3-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
index 9979f540ae343a065d8ca483fa9c5934fc550a46..a6e427af267602a5a862b34270d44c299282ba55 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -3,17 +3,23 @@ kind: benchmark
metadata:
name: uc4-flink
spec:
- appResource:
- - "uc4-flink/flink-configuration-configmap.yaml"
- - "uc4-flink/taskmanager-deployment.yaml"
- - "uc4-flink/taskmanager-service.yaml"
- - "uc4-flink/service-monitor.yaml"
- - "uc4-flink/jobmanager-service.yaml"
- - "uc4-flink/jobmanager-deployment.yaml"
- #- "uc4-flink/jobmanager-rest-service.yaml"
- loadGenResource:
- - "uc4-kstreams/uc4-load-generator-deployment.yaml"
- - "uc4-kstreams/uc4-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc4-flink"
+ files:
+ - "uc4-flink/flink-configuration-configmap.yaml"
+ - "uc4-flink/taskmanager-deployment.yaml"
+ - "uc4-flink/taskmanager-service.yaml"
+ - "uc4-flink/service-monitor.yaml"
+ - "uc4-flink/jobmanager-service.yaml"
+ - "uc4-flink/jobmanager-deployment.yaml"
+ #- "uc4-flink/jobmanager-rest-service.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc4-loadgen"
+ files:
+ - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ - "uc4-kstreams/uc4-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
index 61cdfeeea5298d05cca5f5a44cdb4bdf9f108b7c..828ab9321b85b6c186a89f54586c312bace0fd53 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
@@ -3,14 +3,20 @@ kind: benchmark
metadata:
name: uc4-kstreams
spec:
- appResource:
- - "uc4-kstreams/uc4-kstreams-deployment.yaml"
- - "uc4-kstreams/uc4-kstreams-service.yaml"
- - "uc4-kstreams/uc4-jmx-configmap.yaml"
- - "uc4-kstreams/uc4-service-monitor.yaml"
- loadGenResource:
- - "uc4-kstreams/uc4-load-generator-deployment.yaml"
- - "uc4-kstreams/uc4-load-generator-service.yaml"
+ appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc4-kstreams"
+ files:
+ - "uc4-kstreams/uc4-kstreams-deployment.yaml"
+ - "uc4-kstreams/uc4-kstreams-service.yaml"
+ - "uc4-kstreams/uc4-jmx-configmap.yaml"
+ - "uc4-kstreams/uc4-service-monitor.yaml"
+ loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc4-loadgen"
+ files:
+ - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ - "uc4-kstreams/uc4-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
index ec7a67db4ea24547bc23d5c57e7b907ba489859c..ab112cdcb1adcc1cb8a1a4fd455af5d4aec888a2 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
@@ -1,12 +1,18 @@
name: "uc4-kstreams"
-appResource:
- - "uc4-kstreams-deployment.yaml"
- - "uc4-kstreams-service.yaml"
- - "uc4-jmx-configmap.yaml"
- - "uc4-service-monitor.yaml"
-loadGenResource:
- - "uc4-load-generator-deployment.yaml"
- - "uc4-load-generator-service.yaml"
+appResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc4-kstreams"
+ files:
+ - "uc4-kstreams/uc4-kstreams-deployment.yaml"
+ - "uc4-kstreams/uc4-kstreams-service.yaml"
+ - "uc4-kstreams/uc4-jmx-configmap.yaml"
+ - "uc4-kstreams/uc4-service-monitor.yaml"
+loadGenResourceSets:
+ - configMap:
+ name: "benchmark-resources-uc4-loadgen"
+ files:
+ - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ - "uc4-kstreams/uc4-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc4-loadGen/uc4-load-generator-service.yaml
diff --git a/theodolite/crd/crd-execution.yaml b/theodolite/crd/crd-execution.yaml
index 47d0306f5150a8126f021c40bf3c4a4ce0e1abb1..d9cd41903bb2fdc18bd6640bdbe2eb764b2106ab 100644
--- a/theodolite/crd/crd-execution.yaml
+++ b/theodolite/crd/crd-execution.yaml
@@ -51,7 +51,7 @@ spec:
description: The type of the resource. It must match one of the resource types specified in the referenced benchmark.
type: string
resourceValues:
- descriptoin: List of resource values for the specified resource type.
+ description: List of resource values for the specified resource type.
type: array
items:
type: integer