update benchmark defintions in order to use resource sets

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

theodolite-benchmarks/definitions/install-configmaps.sh

+# 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

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:

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:

theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml

 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:

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:

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:

theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml

 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:

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:

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:

theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml

 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:

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:

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:

theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml

 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: